From 0fb1cacdb7ca4cbd4dbc2d615aac56a985520df6 Mon Sep 17 00:00:00 2001 From: Elvis de Freitas Souza Date: Tue, 4 Dec 2018 00:16:15 -0200 Subject: [PATCH] #87 Build arm images on travis cause docker huber haven't support (#101) --- .travis.yml | 7 ++++++- Dockerfile.arm7x86.hub | 2 +- Dockerfile.arm8x64.hub | 2 +- Dockerfile.arm8x86 | 5 ----- Dockerfile.arm8x86.hub | 9 --------- Dockerfile.hub | 2 +- RELEASE-NOTES.md | 3 +++ VERSION | 2 +- builder.bash | 3 ++- docker-compose.yml | 6 ------ 10 files changed, 15 insertions(+), 26 deletions(-) delete mode 100644 Dockerfile.arm8x86 delete mode 100644 Dockerfile.arm8x86.hub diff --git a/.travis.yml b/.travis.yml index eda90977c..1aac1cbb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,12 @@ sudo: required services: - docker -script: docker-compose up --force-recreate --abort-on-container-exit prod-ci-deploy +script: + - | + docker-compose up --force-recreate --abort-on-container-exit prod-ci-deploy &&\ + docker-compose build prod-build-image-dps-arm7x86 prod-build-image-dps-arm8x64 &&\ + echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin &&\ + docker-compose push prod-build-image-dps-arm7x86 prod-build-image-dps-arm8x64 branches: only: diff --git a/Dockerfile.arm7x86.hub b/Dockerfile.arm7x86.hub index af3b43507..e4acbaea8 100644 --- a/Dockerfile.arm7x86.hub +++ b/Dockerfile.arm7x86.hub @@ -3,7 +3,7 @@ WORKDIR /app ENV TMP_NAME=/tmp/dns-proxy-server.tgz RUN apt-get update && apt-get install --force-yes -y curl RUN curl -L https://github.com/mageddo/dns-proxy-server/releases/download/2.10.1/dns-proxy-server-linux-arm-2.10.1.tgz > $TMP_NAME && \ - tar -xvf $TMP_NAME -C /app/ && rm -f $TMP_NAME && apt purge --force-yes -y curl + tar -xvf $TMP_NAME -C /app/ && rm -f $TMP_NAME && apt-get purge --force-yes -y curl VOLUME ["/var/run/docker.sock", "/var/run/docker.sock"] CMD ["bash", "-c", "/app/dns-proxy-server"] diff --git a/Dockerfile.arm8x64.hub b/Dockerfile.arm8x64.hub index f3be3d91c..5fc64e2a5 100644 --- a/Dockerfile.arm8x64.hub +++ b/Dockerfile.arm8x64.hub @@ -3,7 +3,7 @@ WORKDIR /app ENV TMP_NAME=/tmp/dns-proxy-server.tgz RUN apt-get update && apt-get install --force-yes -y curl RUN curl -L https://github.com/mageddo/dns-proxy-server/releases/download/2.10.1/dns-proxy-server-linux-arm64-2.10.1.tgz > $TMP_NAME && \ - tar -xvf $TMP_NAME -C /app/ && rm -f $TMP_NAME && apt purge --force-yes -y curl + tar -xvf $TMP_NAME -C /app/ && rm -f $TMP_NAME && apt-get purge --force-yes -y curl VOLUME ["/var/run/docker.sock", "/var/run/docker.sock"] CMD ["bash", "-c", "/app/dns-proxy-server"] diff --git a/Dockerfile.arm8x86 b/Dockerfile.arm8x86 deleted file mode 100644 index 55d92b5c8..000000000 --- a/Dockerfile.arm8x86 +++ /dev/null @@ -1,5 +0,0 @@ -FROM arm32v7/debian:7 -ADD build/dns-proxy-server-linux-arm-*.tgz /app/ -WORKDIR /app -VOLUME ["/var/run/docker.sock", "/var/run/docker.sock"] -CMD ["bash", "-c", "/app/dns-proxy-server"] diff --git a/Dockerfile.arm8x86.hub b/Dockerfile.arm8x86.hub deleted file mode 100644 index e4acbaea8..000000000 --- a/Dockerfile.arm8x86.hub +++ /dev/null @@ -1,9 +0,0 @@ -FROM arm32v7/debian:7 -WORKDIR /app -ENV TMP_NAME=/tmp/dns-proxy-server.tgz -RUN apt-get update && apt-get install --force-yes -y curl -RUN curl -L https://github.com/mageddo/dns-proxy-server/releases/download/2.10.1/dns-proxy-server-linux-arm-2.10.1.tgz > $TMP_NAME && \ - tar -xvf $TMP_NAME -C /app/ && rm -f $TMP_NAME && apt-get purge --force-yes -y curl - -VOLUME ["/var/run/docker.sock", "/var/run/docker.sock"] -CMD ["bash", "-c", "/app/dns-proxy-server"] diff --git a/Dockerfile.hub b/Dockerfile.hub index 7160b368f..6645d2804 100644 --- a/Dockerfile.hub +++ b/Dockerfile.hub @@ -3,7 +3,7 @@ WORKDIR /app ENV TMP_NAME=/tmp/dns-proxy-server.tgz RUN apt-get update && apt-get install --force-yes -y curl RUN curl -L https://github.com/mageddo/dns-proxy-server/releases/download/2.10.1/dns-proxy-server-linux-amd64-2.10.1.tgz > $TMP_NAME && \ - tar -xvf $TMP_NAME -C /app/ && rm -f $TMP_NAME && apt purge-get --force-yes -y curl + tar -xvf $TMP_NAME -C /app/ && rm -f $TMP_NAME && apt-get purge --force-yes -y curl VOLUME ["/var/run/docker.sock", "/var/run/docker.sock"] CMD ["bash", "-c", "/app/dns-proxy-server"] diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 5cda4d55d..a5294b72d 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,6 @@ +### 2.10.3 +* Build arm images on travis cause docker huber haven't support + ### 2.10.2 * Fixing binaries were generated for wrong arch diff --git a/VERSION b/VERSION index c6436a853..5f4f65c85 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.10.2 +2.10.3 diff --git a/builder.bash b/builder.bash index f8a1b8ee0..ec288252c 100755 --- a/builder.bash +++ b/builder.bash @@ -141,7 +141,8 @@ case $1 in if [ "$CURRENT_BRANCH" = "master" ]; then echo "> deploying new version" builder.bash validate-release || exit 0 && builder.bash apply-version && builder.bash build &&\ - builder.bash upload-release && builder.bash trigger-docker-hub + builder.bash upload-release + else echo "> building candidate" builder.bash build diff --git a/docker-compose.yml b/docker-compose.yml index 64f1d56e7..4b27482aa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -53,12 +53,6 @@ services: dockerfile: Dockerfile.arm8x64 image: defreitas/dns-proxy-server-arm8x64:2.10.2 - prod-build-image-dps-arm8x86: - build: - context: . - dockerfile: Dockerfile.arm8x86 - image: defreitas/dns-proxy-server-arm8x86:2.10.2 - # build the project and make the github release prod-ci-deploy: container_name: prod-ci-deploy