From 98522f0b038e5b03173377939323a896839f60a3 Mon Sep 17 00:00:00 2001
From: Izel Nakri <contact@izelnakri.com>
Date: Sun, 1 Mar 2020 07:47:50 +0100
Subject: [PATCH] further runtime optimization for CI

---
 .circleci/config.yml | 10 +++++-----
 .env                 |  5 +++--
 circle.yml           | 34 ----------------------------------
 docker-compose.yaml  |  4 ++--
 4 files changed, 10 insertions(+), 43 deletions(-)
 delete mode 100644 circle.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5fdcdbb3..d7a63a03 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -11,19 +11,19 @@ jobs:
           name: Build application Docker image
           command: |
             docker build -t paper_trail .
+      - run:
+          name: Install docker-compose
+          command: |
+            apk add docker-compose
       - deploy:
           name: Push application Docker image
           command: |
             DOCKER_TAG=$(echo paper_trail:${CIRCLE_BRANCH} | tr '/' '_')
             DOCKER_TARGET_REMOTE="${HUB_USERNAME}/${DOCKER_TAG}"
+            sed -i $(echo "s/\$DOCKER_TAG/$DOCKER_TAG/g") /code/.env
             echo $HUB_KEY | docker login -u $HUB_USERNAME --password-stdin
             docker tag paper_trail "${DOCKER_TARGET_REMOTE}"
             docker push "${DOCKER_TARGET_REMOTE}"
-      - run:
-          name: Pull and run a docker container
-          command: |
-            apk add docker-compose
-            sed -i $(echo "s/\$CIRCLE_BRANCH/$CIRCLE_BRANCH/g") /code/.env
       - run: docker-compose run paper_trail mix test test/paper_trail
       - run: docker-compose run paper_trail mix test test/version
       - run: docker-compose run paper_trail mix test test/uuid
diff --git a/.env b/.env
index fe4fc6dc..22fb88c0 100644
--- a/.env
+++ b/.env
@@ -4,5 +4,6 @@ POSTGRES_HOST=localhost
 PG_HOST=localhost
 MIX_ENV=test
 # CIRCLE_BRANCH=$$(if [ -v CIRCLE_BRANCH ]; then echo master; else git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'; fi)
-CIRCLE_BRANCH=$CIRCLE_BRANCH
-DOCKER_TAG=$(echo paper_trail:${CIRCLE_BRANCH} | tr '/' '_')
+# DOCKER_TAG=paper_trail:master
+# DOCKER_TAG=$(echo paper_trail:${CIRCLE_BRANCH} | tr '/' '_')
+DOCKER_TAG=$DOCKER_TAG
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index d7364f0c..00000000
--- a/circle.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-machine:
-  environment:
-    PATH: "$HOME/.asdf/bin:$HOME/.asdf/shims:$PATH"
-    MIX_ENV: test
-
-database:
-  override:
-    - createdb paper_trail_test
-    - createdb paper_trail_example_test
-    - createdb paper_trail_uuid_test
-
-dependencies:
-  cache_directories:
-    - ~/.asdf
-    - deps
-    - _build
-  pre:
-    - if ! asdf | grep version; then git clone https://github.com/asdf-vm/asdf.git ~/.asdf; fi
-    - asdf plugin-add erlang https://github.com/asdf-vm/asdf-erlang.git || true
-    - asdf plugin-add elixir https://github.com/asdf-vm/asdf-elixir.git || true
-    - echo "erlang 19.0" >> .tool-versions
-    - echo "elixir 1.4.0" >> .tool-versions
-    - asdf install
-    - mix local.hex --force
-    - mix local.rebar --force
-  override:
-    - mix deps.get
-    - mix deps.compile
-    - cd example && mix deps.get
-    - cd example && mix deps.compile
-test:
-  override:
-    - MIX_ENV=test mix test --trace
-    - cd example && mix test --trace
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 36ab34d0..eeb3733d 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -12,12 +12,12 @@ services:
     volumes:
       - pgdata:/var/lib/postgresql/data
   paper_trail:
-    image: inakri/paper_trail:$CIRCLE_BRANCH
+    image: inakri/$DOCKER_TAG
     build:
       context: .
       dockerfile: Dockerfile
       cache_from:
-        - inakri/paper_trail:$CIRCLE_BRANCH
+        - inakri/$DOCKER_TAG
     environment:
       POSTGRES_USER: $POSTGRES_USER
       POSTGRES_PASSWORD: $POSTGRES_PASSWORD