Adding docker image and release scripts #123

anubhavmishra · 2017-08-16T05:07:29Z

Adding a Dockerfile
Switched to CircleCI version 2
Created a release process for our binaries for different platforms
We now use CircleCI to push docker images

Fixes: #105

lkysow · 2017-08-16T05:56:46Z

Dockerfile

@@ -0,0 +1,46 @@
+FROM alpine:3.4
+MAINTAINER Anubhav Mishra <anubhav.mishra@hootsuite.com>


what about me?!?!

Also MAINTAINER is deprecated now, use LABEL maintainer="SvenDowideit@home.org.au" instead (see https://docs.docker.com/engine/reference/builder/#maintainer-deprecated)

lkysow · 2017-08-16T05:59:08Z

Dockerfile

@@ -0,0 +1,46 @@
+FROM alpine:3.4


someone else mentioned this (can't find where) but you should use 3.6 since it's the latest

lkysow · 2017-08-16T05:59:52Z

Dockerfile

+FROM alpine:3.4
+MAINTAINER Anubhav Mishra <anubhav.mishra@hootsuite.com>
+
+ENV DOCKER_BASE_VERSION=0.0.4


can you add the comment from here: https://github.com/hashicorp/docker-consul/blob/master/0.X/Dockerfile#L8 otherwise unclear what this is for

lkysow · 2017-08-16T06:03:57Z

docker-entrypoint.sh

+fi
+
+# Look for atlantis subcommands.
+if [ "$1" = '--version' ]; then


we don't have a --version flag

lkysow · 2017-08-16T06:06:53Z

Dockerfile

+    gpg --batch --verify docker-base_${DOCKER_BASE_VERSION}_SHA256SUMS.sig docker-base_${DOCKER_BASE_VERSION}_SHA256SUMS && \
+    grep ${DOCKER_BASE_VERSION}_linux_amd64.zip docker-base_${DOCKER_BASE_VERSION}_SHA256SUMS | sha256sum -c && \
+    unzip docker-base_${DOCKER_BASE_VERSION}_linux_amd64.zip && \
+    cp bin/gosu bin/dumb-init /bin && \


is this all just to get gosu and dumb-init? Why not install directly

https://github.com/Yelp/dumb-init#option-3-downloading-the-binary-directly
https://github.com/tianon/gosu#installation

lkysow · 2017-08-16T06:07:24Z

Dockerfile

+COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
+
+ENTRYPOINT ["docker-entrypoint.sh"]
+CMD ["server"]


just curious how big is the container in the end?

lkysow · 2017-08-16T06:07:39Z

docker-entrypoint.sh

+    # We can't use the return code to check for the existence of a subcommand, so
+    # we have to use grep to look for a pattern in the help output.
+    set -- atlantis "$@"
+fi


can you check if we need all this?

anubhavmishra · 2017-08-16T07:52:27Z

Finally got it working with CircleCI version 2! Mark spend a day on this, now I know why. :(

lkysow · 2017-08-16T16:46:10Z

.circleci/config.yml

+          command: make end-to-end-deps
+      - run:
+          name: Starting atlantis server in the background
+          command: cd "${CIRCLE_WORKING_DIRECTORY}/e2e" && ./atlantis server --gh-user="$GITHUB_USERNAME" --gh-token="$GITHUB_PASSWORD" --data-dir="/tmp" --log-level="debug" &> /tmp/atlantis-server.log


should we add the webhook-secret as well?

lkysow · 2017-08-16T16:49:10Z

.circleci/config.yml

+          # https://discuss.circleci.com/t/git-tag-deploys-in-2-0/9493/6
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              for TAG in $(git tag --contains $CIRCLE_SHA1); do


so this checks if there's a tag for this commit and if so pushes a new docker image? Doesn't this build run on master so how will there be a tag at the time that this build runs?

yea, so CircleCI doesn't have support for tagged events from Github. So we will merge something to master, create a tag and then rebuild on master to push the docker image.

lkysow · 2017-08-16T16:50:44Z

README.md

@@ -258,6 +258,44 @@ $ atlantis server --atlantis-url $URL --gh-user $USERNAME --gh-token $TOKEN --gh
 Atlantis is now running!
 **We recommend running it under something like Systemd or Supervisord.**

+### Docker


add to the outline at the top

lkysow · 2017-08-16T16:52:42Z

README.md

@@ -258,6 +258,44 @@ $ atlantis server --atlantis-url $URL --gh-user $USERNAME --gh-token $TOKEN --gh
 Atlantis is now running!
 **We recommend running it under something like Systemd or Supervisord.**

+### Docker
+Atlantis also ships inside a docker image along side Terraform binaries. Run the docker image:


maybe instead of "along side Ter.." say "Atlantis also ships inside a Docker image with Terraform versions 0.8.8, 0.9.11 and 0.10.0"? Probably better to be clear about what's in the Docker image so people don't have to look at the Dockerfile

lkysow · 2017-08-16T16:54:28Z

README.md

+# copy aws credentials
+COPY credentials /home/atlantis/.aws/credentials
+
+ENTRYPOINT ["docker-entrypoint.sh"]


do we need to redefine the ENTRYPOINT and CMD?

just tested it, we don't need to redefine them, they're inherited.

lkysow · 2017-08-16T16:55:28Z

README.md

+* Build docker image
+
+```bash
+docker build -t hootsuite/atlantis-custom -f Dockerfile-custom


probably wouldn't make sense for them to name it hootsuite/atlantis-custom since they don't be able to push to our Docker registry. Maybe just say docker build -t {your-docker-org}/atlantis-custom?

lkysow · 2017-08-16T16:56:09Z

README.md

+* Run docker image
+
+```bash
+docker run -it hootsuite/atlantis-custom server --gh-user=GITHUB_USERNAME --gh-token=GITHUB_TOKEN


they don't need to run -it do they?

lkysow · 2017-08-16T16:56:43Z

scripts/e2e-deps.sh


 # cd into e2e folder
 cd e2e/
 # Decrypting secrets for atlantis runtime: https://github.com/circleci/encrypted-files
-openssl aes-256-cbc -d -in secrets-envs -k $KEY >> ~/.circlerc
+# openssl aes-256-cbc -d -in secrets-envs -k $KEY >> ~/.circlerc


don't need this anymore? can we delete it?

so0k · 2017-08-17T06:55:10Z

Cool! wouldn't it be necessary to use a filter for the ngrok query (based on the protocol)

Like I did here: https://github.com/honestbee/atlantis/commit/f76eb19e62f2f42aa7441a0c2e6bf235cf9a363b#diff-fd8635a5248b5832a7faf06a8e572e17R12

Adding docker image and release scripts

97dbd9b

anubhavmishra requested a review from lkysow August 16, 2017 05:07

lkysow requested changes Aug 16, 2017

View reviewed changes

Anubhav Mishra added 11 commits August 15, 2017 23:12

Using circleci version 2

9a465d9

now building dumb-init and gosu from source

4a9e845

trying to fix e2e tests

f283ad9

fixing working directory for circleci version 2

0e5c5b3

start atlantis server and ngrok in the background

eba37fe

Adding terraform to path and removing old decryption method for circleci

b13ca42

adding terraform binary to the correct path

a2f8b15

ATLANTIS_URL is now being exported

7b7426b

using circleci version 2 syntax to export variable

003c412

using circleci version 2 syntax to export variable

10590dd

ngrok isnt working now

89420d2

Updating CHANGELOG

4c576f0

lkysow reviewed Aug 16, 2017

View reviewed changes

Fixes after review and updated README.md

82a7195

lkysow approved these changes Aug 16, 2017

View reviewed changes

anubhavmishra merged commit 6b55b08 into master Aug 16, 2017

anubhavmishra deleted the docker-image-release branch August 16, 2017 20:29

lkysow mentioned this pull request Aug 17, 2017

Ensure we're using the http protocol for ngrok #130

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding docker image and release scripts #123

Adding docker image and release scripts #123

anubhavmishra commented Aug 16, 2017 •

edited

Loading

lkysow Aug 16, 2017

lkysow Aug 16, 2017

lkysow Aug 16, 2017

lkysow Aug 16, 2017

lkysow Aug 16, 2017

lkysow Aug 16, 2017

lkysow Aug 16, 2017

lkysow Aug 16, 2017

anubhavmishra commented Aug 16, 2017

lkysow Aug 16, 2017

lkysow Aug 16, 2017

anubhavmishra Aug 16, 2017

lkysow Aug 16, 2017

anubhavmishra Aug 16, 2017

lkysow Aug 16, 2017

lkysow Aug 16, 2017

lkysow Aug 16, 2017

lkysow Aug 16, 2017

lkysow Aug 16, 2017

lkysow Aug 16, 2017

so0k commented Aug 17, 2017

		@@ -0,0 +1,46 @@
		FROM alpine:3.4
		MAINTAINER Anubhav Mishra <anubhav.mishra@hootsuite.com>

Adding docker image and release scripts #123

Adding docker image and release scripts #123

Conversation

anubhavmishra commented Aug 16, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

anubhavmishra commented Aug 16, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

so0k commented Aug 17, 2017

anubhavmishra commented Aug 16, 2017 •

edited

Loading