pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update workflow to add buildinfo files to directory structure before container is built

Browse Source
This commit is contained in:
Devon Mackay 2018-09-21 11:55:33 -04:00
parent f5a61d7598
commit fa847d28f0
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -29,13 +29,13 @@ before_script:
- docker run --link postgres96:postgres96 --link redis:redis waisbrot/wait - docker run --link postgres96:postgres96 --link redis:redis waisbrot/wait
- export postgres_ip="$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" postgres96)" - export postgres_ip="$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" postgres96)"
- export redis_ip="$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" redis)" - export redis_ip="$(docker inspect -f "{{ .NetworkSettings.IPAddress }}" redis)"
- ./script/generate_build_info.sh
- docker login -u $ATAT_DOCKER_REGISTRY_USERNAME -p $ATAT_DOCKER_REGISTRY_PASSWORD $ATAT_DOCKER_REGISTRY_URL - docker login -u $ATAT_DOCKER_REGISTRY_USERNAME -p $ATAT_DOCKER_REGISTRY_PASSWORD $ATAT_DOCKER_REGISTRY_URL
- docker build --tag "${TESTER_IMAGE1_NAME}" --add-host "postgreshost:${postgres_ip}" --add-host "redishost:${redis_ip}" . -f deploy/docker/tester/Dockerfile - docker build --tag "${TESTER_IMAGE1_NAME}" --add-host "postgreshost:${postgres_ip}" --add-host "redishost:${redis_ip}" . -f deploy/docker/tester/Dockerfile
script: script:
- docker run -d --entrypoint='/bin/sh' -t --name current-atst-tester "${TESTER_IMAGE1_NAME}" - docker run -d --entrypoint='/bin/sh' -t --name current-atst-tester "${TESTER_IMAGE1_NAME}"
- docker container exec -t current-atst-tester script/sync-crls - docker container exec -t current-atst-tester script/sync-crls
- docker container exec -t current-atst-tester script/generate_build_info.sh
- docker commit - docker commit
--change='ENTRYPOINT ["/usr/bin/dumb-init", "--"]' --change='ENTRYPOINT ["/usr/bin/dumb-init", "--"]'
--change='CMD ["bash", "-c", "${APP_DIR}/script/cibuild"]' --change='CMD ["bash", "-c", "${APP_DIR}/script/cibuild"]'

4
deploy/docker/tester/Dockerfile
View File

@ -31,10 +31,6 @@ COPY script/ ./script/
RUN set -x ; \ RUN set -x ; \
script/alpine_setup script/alpine_setup
# Add git for buildinfo, which only the tester needs
RUN set -x ; \
apk add git
### Items that will change almost every build ### Items that will change almost every build
############################################# #############################################
# Copy over the rest of the app source # Copy over the rest of the app source