Skip to content

Commit

Permalink
#87 Build arm images on travis cause docker huber haven't support (#101)
Browse files Browse the repository at this point in the history
  • Loading branch information
mageddo authored Dec 4, 2018
1 parent 5bdbc91 commit 0fb1cac
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 26 deletions.
7 changes: 6 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.arm7x86.hub
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion Dockerfile.arm8x64.hub
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
5 changes: 0 additions & 5 deletions Dockerfile.arm8x86

This file was deleted.

9 changes: 0 additions & 9 deletions Dockerfile.arm8x86.hub

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile.hub
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
3 changes: 3 additions & 0 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.10.2
2.10.3
3 changes: 2 additions & 1 deletion builder.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0fb1cac

Please sign in to comment.