From 674f608c4793f753f0cf9ab0d2c787d2b9c773cc Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Thu, 23 Apr 2020 21:46:47 -0700 Subject: [PATCH 01/23] docker-compose for functional testing --- .github/workflows/build.yml | 19 ---------- .github/workflows/deploy.yml | 8 ---- .github/workflows/main.yml | 67 +++++++++++++++++++++++++++++++++ .github/workflows/unit-test.yml | 41 -------------------- Dockerfile | 5 ++- docker-compose.dev.yml | 5 +++ docker-compose.test.yml | 5 +++ docker-compose.yml | 44 ++++++++++++++++++++++ mix.exs | 10 ++--- 9 files changed, 129 insertions(+), 75 deletions(-) delete mode 100644 .github/workflows/build.yml delete mode 100644 .github/workflows/deploy.yml create mode 100644 .github/workflows/main.yml delete mode 100644 .github/workflows/unit-test.yml create mode 100644 docker-compose.dev.yml create mode 100644 docker-compose.test.yml create mode 100644 docker-compose.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index bfcc69caf..000000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Build -description: 'Build and push docker images.' - -on: - push: - branches: - - master - -jobs: - build-app-image: - runs-on: ubuntu:18.04 - steps: - - uses: actions/checkout@v2 - - name: Build Docker Image - run: | - docker build -t cloudfirellc/cloudfire:${GITHUB_SHA::8} . - - name: Push Docker Image - run: | - docker push cloudfirellc/cloudfire:latest diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index 04864f95e..000000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Deploy -description: "Deploy images" - -on: - release: created - -jobs: - diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 000000000..b216ac527 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,67 @@ +# Steps: +# 1. Unit/Integration Tests +# 2. Build and Push App Image +# 3. Functional Test +name: Test +description: "Unit, Integration, and Functional tests." +on: + - push +jobs: + # 1. Unit/Integration Test + unit-integration-test: + runs-on: ubuntu-18.04 + env: + MIX_ENV: test + POSTGRES_HOST: localhost + services: + postgres: + image: postgres:12 + ports: + - 5432:5432 + env: + POSTGRES_PASSWORD: postgres + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 + + steps: + - uses: actions/checkout@v2 + - name: Run Static Tests + uses: actions/setup-elixir@v1 + with: + elixir-version: 1.10.2 + otp-version: 22.3.2 + - name: Install Dependencies + run: mix deps.get --only test + - name: Setup Database + run: | + mix ecto.create + mix ecto.migrate + - name: Run Tests + run: mix test + + # 2. Build and Push App Image + build-app-image: + env: + TEST_IMAGE: docker.pkg.github.com/CloudFire-LLC/cloudfire-ce/cloudfire:${GITHUB_SHA::8} + runs-on: ubuntu:18.04 + steps: + - uses: actions/checkout@v2 + - name: Build Docker Image + run: docker build -t $TEST_IMAGE -f Dockerfile . + - name: Push Docker Image + run: docker push $TEST_IMAGE + + # 3. Functional Test + docker-compose-up: + env: + TEST_IMAGE: docker.pkg.github.com/CloudFire-LLC/cloudfire-ce/cloudfire:${GITHUB_SHA::8} + runs-on: ubuntu:18.04 + steps: + - uses: actions/checkout@v2 + - name: Functional Test + run: | + docker-compose up -d -f docker-compose.yml -f docker-compose.test.yml + echo 'Tests completed!' diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml deleted file mode 100644 index e5a954013..000000000 --- a/.github/workflows/unit-test.yml +++ /dev/null @@ -1,41 +0,0 @@ -# Unit test -name: CI - -on: - - push - - pull_request - -jobs: - unit-test: - runs-on: ubuntu-18.04 - env: - MIX_ENV: test - POSTGRES_HOST: localhost - services: - postgres: - image: postgres:12 - ports: - - 5432:5432 - env: - POSTGRES_PASSWORD: postgres - options: >- - --health-cmd pg_isready - --health-interval 10s - --health-timeout 5s - --health-retries 5 - - steps: - - uses: actions/checkout@v2 - - name: Run Static Tests - uses: actions/setup-elixir@v1 - with: - elixir-version: 1.10.2 - otp-version: 22.3.2 - - name: Install Dependencies - run: mix deps.get --only test - - name: Setup Database - run: | - mix ecto.create - mix ecto.migrate - - name: Run Tests - run: mix test diff --git a/Dockerfile b/Dockerfile index 53945e644..db056986c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,8 +40,9 @@ COPY $PHOENIX_DIR/lib $PHOENIX_DIR/lib COPY apps/system_engine/lib ./apps/system_engine/ RUN mix compile -# Build release -RUN mix release bundled +# Build releases +RUN mix release cf_phx +RUN mix release system_engine # The built application is now contained in _build/ diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml new file mode 100644 index 000000000..cacf23b6e --- /dev/null +++ b/docker-compose.dev.yml @@ -0,0 +1,5 @@ +services: + cf-phx: + build: ./ + system-engine: + build: ./ diff --git a/docker-compose.test.yml b/docker-compose.test.yml new file mode 100644 index 000000000..ce711a70d --- /dev/null +++ b/docker-compose.test.yml @@ -0,0 +1,5 @@ +services: + cf-phx: + image: ${TEST_IMAGE} + system-engine: + image: ${TEST_IMAGE} diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 000000000..d5db62811 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,44 @@ +# The base docker-compose +version: "3.8" +services: + cf-phx: + command: /app/bin/cf_phx start + image: cloudfirellc/cloudfire:latest + environment: + DATABASE_URL: ecto://postgres:postgres@db/cloudfire + + # !! WARNING !! + # Change this for production systems! + # !!!!!!!!!!!!! + SECRET_KEY_BASE: vw5YEoG6Pb7mCQEC41DjJXIB6v1/tOxO+3YLN+5k+PILkcFMN54g22KXZr6o65Bn + ports: + - 4000:4000 + networks: + - cloudfire + + system-engine: + command: /app/bin/system_engine start + image: cloudfirellc/cloudfire:latest + networks: + - cloudfire + + db: + networks: + - cloudfire + image: postgres:12 + volumes: + - pg-data:/var/lib/postgresql/data + environment: + # !! WARNING !! + # Change this for production systems! + # !!!!!!!!!!!!! + POSTGRES_PASSWORD: postgres + ports: + - 5432:5432 + + +volumes: + pg-data: + +networks: + cloudfire: diff --git a/mix.exs b/mix.exs index a3854a355..aa4601c09 100644 --- a/mix.exs +++ b/mix.exs @@ -8,11 +8,11 @@ defmodule CloudfireUmbrella.MixProject do start_permanent: Mix.env() == :prod, deps: deps(), releases: [ - bundled: [ - applications: [ - cf_phx: :permanent, - system_engine: :permanent - ] + cf_phx: [ + applications: [cf_phx: :permanent] + ], + system_engine: [ + applications: [system_engine: :permanent] ] ] ] From 62574256d53e8dbfcc968994fc912fb44b50e93d Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Thu, 23 Apr 2020 21:48:14 -0700 Subject: [PATCH 02/23] Actions shitty documentation --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b216ac527..c8c6c2905 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,7 +3,6 @@ # 2. Build and Push App Image # 3. Functional Test name: Test -description: "Unit, Integration, and Functional tests." on: - push jobs: From 1e0d5aeadcb93ff93e56e94ba95bc600f0a6f332 Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Thu, 23 Apr 2020 21:53:11 -0700 Subject: [PATCH 03/23] Specify job dependencies --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c8c6c2905..796f5ee0f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,6 +43,7 @@ jobs: # 2. Build and Push App Image build-app-image: + needs: unit-integration-test env: TEST_IMAGE: docker.pkg.github.com/CloudFire-LLC/cloudfire-ce/cloudfire:${GITHUB_SHA::8} runs-on: ubuntu:18.04 @@ -55,6 +56,7 @@ jobs: # 3. Functional Test docker-compose-up: + needs: build-app-image env: TEST_IMAGE: docker.pkg.github.com/CloudFire-LLC/cloudfire-ce/cloudfire:${GITHUB_SHA::8} runs-on: ubuntu:18.04 From 9d8a1550d25256062567893f02e99e7291de2b47 Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Thu, 23 Apr 2020 21:59:58 -0700 Subject: [PATCH 04/23] fix typo --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 796f5ee0f..36c5d7be9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,7 +46,7 @@ jobs: needs: unit-integration-test env: TEST_IMAGE: docker.pkg.github.com/CloudFire-LLC/cloudfire-ce/cloudfire:${GITHUB_SHA::8} - runs-on: ubuntu:18.04 + runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 - name: Build Docker Image @@ -59,7 +59,7 @@ jobs: needs: build-app-image env: TEST_IMAGE: docker.pkg.github.com/CloudFire-LLC/cloudfire-ce/cloudfire:${GITHUB_SHA::8} - runs-on: ubuntu:18.04 + runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 - name: Functional Test From fa80d3b312b144e1d1f6a096288837f2bcd3e10b Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Thu, 23 Apr 2020 22:19:50 -0700 Subject: [PATCH 05/23] try variable properly --- .github/workflows/main.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 36c5d7be9..453c7d6c9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,13 +44,11 @@ jobs: # 2. Build and Push App Image build-app-image: needs: unit-integration-test - env: - TEST_IMAGE: docker.pkg.github.com/CloudFire-LLC/cloudfire-ce/cloudfire:${GITHUB_SHA::8} runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 - name: Build Docker Image - run: docker build -t $TEST_IMAGE -f Dockerfile . + run: docker build -t docker.pkg.github.com/CloudFire-LLC/cloudfire-ce/cloudfire:${GITHUB_SHA::8} -f Dockerfile . - name: Push Docker Image run: docker push $TEST_IMAGE @@ -58,7 +56,7 @@ jobs: docker-compose-up: needs: build-app-image env: - TEST_IMAGE: docker.pkg.github.com/CloudFire-LLC/cloudfire-ce/cloudfire:${GITHUB_SHA::8} + TEST_IMAGE: "docker.pkg.github.com/CloudFire-LLC/cloudfire-ce/cloudfire:${GITHUB_SHA::8}" runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 From cbcc8122b1cb33f5d6583ef5b20216dbd26fbb13 Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Thu, 23 Apr 2020 22:23:37 -0700 Subject: [PATCH 06/23] lowercase repository name --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 453c7d6c9..d2a09329d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,7 +48,8 @@ jobs: steps: - uses: actions/checkout@v2 - name: Build Docker Image - run: docker build -t docker.pkg.github.com/CloudFire-LLC/cloudfire-ce/cloudfire:${GITHUB_SHA::8} -f Dockerfile . + # Repository name must be lowercase + run: docker build -t docker.pkg.github.com/cloudfire-llc/cloudfire-ce/cloudfire:${GITHUB_SHA::8} -f Dockerfile . - name: Push Docker Image run: docker push $TEST_IMAGE @@ -56,7 +57,7 @@ jobs: docker-compose-up: needs: build-app-image env: - TEST_IMAGE: "docker.pkg.github.com/CloudFire-LLC/cloudfire-ce/cloudfire:${GITHUB_SHA::8}" + TEST_IMAGE: "docker.pkg.github.com/cloudfire-llc/cloudfire-ce/cloudfire:${GITHUB_SHA::8}" runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 From 1d50a08bbfd8cb235c4a9271fb0f80decc845aea Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Thu, 23 Apr 2020 22:26:37 -0700 Subject: [PATCH 07/23] Push properly --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d2a09329d..f5a2d0f15 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -51,7 +51,7 @@ jobs: # Repository name must be lowercase run: docker build -t docker.pkg.github.com/cloudfire-llc/cloudfire-ce/cloudfire:${GITHUB_SHA::8} -f Dockerfile . - name: Push Docker Image - run: docker push $TEST_IMAGE + run: docker push docker.pkg.github.com/cloudfire-llc/cloudfire-ce/cloudfire:${GITHUB_SHA::8} # 3. Functional Test docker-compose-up: From 47ffb7feddbc7484ea026eb5bc5bef2dffca6f49 Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Thu, 23 Apr 2020 22:30:48 -0700 Subject: [PATCH 08/23] Add .gitkeep --- priv/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 priv/.gitkeep diff --git a/priv/.gitkeep b/priv/.gitkeep new file mode 100644 index 000000000..e69de29bb From 3b851ca1d6417f0d78fc141e4f4fe3f511449fd5 Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Thu, 23 Apr 2020 22:31:44 -0700 Subject: [PATCH 09/23] No need for priv --- Dockerfile | 1 - priv/.gitkeep | 0 2 files changed, 1 deletion(-) delete mode 100644 priv/.gitkeep diff --git a/Dockerfile b/Dockerfile index db056986c..fb19138fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,6 @@ RUN mix deps.compile # Build assets COPY $PHOENIX_DIR/assets $PHOENIX_DIR/assets -COPY priv priv COPY $PHOENIX_DIR/priv $PHOENIX_DIR/priv RUN npm install --prefix $PHOENIX_DIR/assets RUN npm run deploy --prefix $PHOENIX_DIR/assets diff --git a/priv/.gitkeep b/priv/.gitkeep deleted file mode 100644 index e69de29bb..000000000 From 292522535ab19233e9054b574cb93b1cfc3e1b83 Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Thu, 23 Apr 2020 22:38:37 -0700 Subject: [PATCH 10/23] Copy release names --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fb19138fc..674005a2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,7 +58,7 @@ ENV PORT=4000 \ RUN mkdir /app WORKDIR /app -COPY --from=builder /app/_build/prod/rel/bundled . +COPY --from=builder /app/_build/prod/rel/cf_phx /app/_build/prod/rel/system_engine . RUN chown -R nobody: /app USER nobody From 6712c0c7e7bf4d42c78b29cf6d1caff26289896a Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Thu, 23 Apr 2020 22:43:30 -0700 Subject: [PATCH 11/23] Use Dockerfile correctly --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 674005a2a..5e6a3cd55 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,7 +58,7 @@ ENV PORT=4000 \ RUN mkdir /app WORKDIR /app -COPY --from=builder /app/_build/prod/rel/cf_phx /app/_build/prod/rel/system_engine . +COPY --from=builder /app/_build/prod/rel/cf_phx /app/_build/prod/rel/system_engine ./ RUN chown -R nobody: /app USER nobody From 47a14ca5bf2851bd3c17dff0c2e6ccdebfb68920 Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Thu, 23 Apr 2020 22:55:07 -0700 Subject: [PATCH 12/23] Try building and pushing using Github token --- .github/workflows/main.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f5a2d0f15..43f68aaa9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,12 +46,13 @@ jobs: needs: unit-integration-test runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v2 - - name: Build Docker Image - # Repository name must be lowercase - run: docker build -t docker.pkg.github.com/cloudfire-llc/cloudfire-ce/cloudfire:${GITHUB_SHA::8} -f Dockerfile . - - name: Push Docker Image - run: docker push docker.pkg.github.com/cloudfire-llc/cloudfire-ce/cloudfire:${GITHUB_SHA::8} + - uses: docker/build-push-action@v1 + with: + username: jamilbk + password: ${{ secrets.GITHUB_TOKEN }} + repository: docker.pkg.github.com/cloudfire-llc/cloudfire-ce/cloudfire + tag_with_ref: true + tag_with_sha: true # 3. Functional Test docker-compose-up: From fb0cef08e6c10ef9ebf60a290ab1dd9247a31562 Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Thu, 23 Apr 2020 22:58:03 -0700 Subject: [PATCH 13/23] Github push --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 43f68aaa9..ab8722d33 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,7 +48,7 @@ jobs: steps: - uses: docker/build-push-action@v1 with: - username: jamilbk + username: $GITHUB_ACTOR password: ${{ secrets.GITHUB_TOKEN }} repository: docker.pkg.github.com/cloudfire-llc/cloudfire-ce/cloudfire tag_with_ref: true From 15ffb3a3c531382eecda0c3ea194e4449a0077b2 Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Thu, 23 Apr 2020 23:04:20 -0700 Subject: [PATCH 14/23] push to github --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ab8722d33..348bf8961 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -50,9 +50,9 @@ jobs: with: username: $GITHUB_ACTOR password: ${{ secrets.GITHUB_TOKEN }} + registry: docker.pkg.github.com repository: docker.pkg.github.com/cloudfire-llc/cloudfire-ce/cloudfire - tag_with_ref: true - tag_with_sha: true + tag: ${GITHUB_SHA::8} # 3. Functional Test docker-compose-up: From a398657b19a8c7a173517f0ecedc6a9f3363438a Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Thu, 23 Apr 2020 23:09:25 -0700 Subject: [PATCH 15/23] Send Dockerfile --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 348bf8961..aab146afb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,6 +48,7 @@ jobs: steps: - uses: docker/build-push-action@v1 with: + dockerfile: ./Dockerfile username: $GITHUB_ACTOR password: ${{ secrets.GITHUB_TOKEN }} registry: docker.pkg.github.com From 3556e45e15bf08ef777202352e28a00ce25fdc0d Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Thu, 23 Apr 2020 23:16:23 -0700 Subject: [PATCH 16/23] Checkout code derp --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aab146afb..3fa17a58a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,9 +46,9 @@ jobs: needs: unit-integration-test runs-on: ubuntu-18.04 steps: + - uses: actions/checkout@v2 - uses: docker/build-push-action@v1 with: - dockerfile: ./Dockerfile username: $GITHUB_ACTOR password: ${{ secrets.GITHUB_TOKEN }} registry: docker.pkg.github.com From 3bf324cc2281ea539a1e6b59e57b72ca7c6e80f9 Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Thu, 23 Apr 2020 23:32:37 -0700 Subject: [PATCH 17/23] Please --- .github/workflows/main.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3fa17a58a..bfb7386c6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -52,18 +52,17 @@ jobs: username: $GITHUB_ACTOR password: ${{ secrets.GITHUB_TOKEN }} registry: docker.pkg.github.com - repository: docker.pkg.github.com/cloudfire-llc/cloudfire-ce/cloudfire + repository: cloudfire-llc/cloudfire-ce/cloudfire tag: ${GITHUB_SHA::8} # 3. Functional Test docker-compose-up: needs: build-app-image - env: - TEST_IMAGE: "docker.pkg.github.com/cloudfire-llc/cloudfire-ce/cloudfire:${GITHUB_SHA::8}" runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 - name: Functional Test run: | - docker-compose up -d -f docker-compose.yml -f docker-compose.test.yml + echo "TEST_IMAGE=docker.pkg.github.com/cloudfire-llc/cloudfire-ce/cloudfire:${GITHUB_SHA::8}" > .env + docker-compose -f docker-compose.yml -f docker-compose.test.yml up -d echo 'Tests completed!' From 6bae71dd78b726fc72664b85a033176444a21d60 Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Thu, 23 Apr 2020 23:49:44 -0700 Subject: [PATCH 18/23] Fix compose version --- docker-compose.test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index ce711a70d..93a9be0d2 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -1,3 +1,4 @@ +version: "3.8" services: cf-phx: image: ${TEST_IMAGE} From 4cec412d0239a082834cb28f6c516be771eb8c66 Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Fri, 24 Apr 2020 15:25:42 -0700 Subject: [PATCH 19/23] Use a lower docker-compose file version --- docker-compose.dev.yml | 2 ++ docker-compose.test.yml | 2 +- docker-compose.yml | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index cacf23b6e..34d14084e 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,3 +1,5 @@ +version: "3.3" + services: cf-phx: build: ./ diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 93a9be0d2..43dce6313 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -1,4 +1,4 @@ -version: "3.8" +version: "3.3" services: cf-phx: image: ${TEST_IMAGE} diff --git a/docker-compose.yml b/docker-compose.yml index d5db62811..185db1eec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ # The base docker-compose -version: "3.8" +version: "3.3" services: cf-phx: command: /app/bin/cf_phx start From 3e10ce4485ca33676c58168065f0f63c605e1048 Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Fri, 24 Apr 2020 18:50:10 -0700 Subject: [PATCH 20/23] Add docker login --- .github/workflows/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bfb7386c6..3b8798a53 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -61,6 +61,11 @@ jobs: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 + - uses: azure/docker-login@v1 + with: + login-server: docker.pkg.github.com + username: $GITHUB_ACTOR + password: ${{ secrets.GITHUB_TOKEN }} - name: Functional Test run: | echo "TEST_IMAGE=docker.pkg.github.com/cloudfire-llc/cloudfire-ce/cloudfire:${GITHUB_SHA::8}" > .env From 5410f05567b899c46228746c3286107db0770c9a Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Fri, 24 Apr 2020 19:04:23 -0700 Subject: [PATCH 21/23] Push it ourselves dammit --- .github/workflows/main.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3b8798a53..241f8e002 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,13 +47,15 @@ jobs: runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 - - uses: docker/build-push-action@v1 + - uses: azure/docker-login@v1 with: + login-server: docker.pkg.github.com username: $GITHUB_ACTOR password: ${{ secrets.GITHUB_TOKEN }} - registry: docker.pkg.github.com - repository: cloudfire-llc/cloudfire-ce/cloudfire - tag: ${GITHUB_SHA::8} + - run: | + export IMAGE=docker.pkg.github.com/cloudfire-llc/cloudfire-ce/cloudfire:${GITHUB_SHA::8} + docker build -t $IMAGE . + docker push $IMAGE # 3. Functional Test docker-compose-up: From c1611695d5a2fddd0b2cd3a8f060f389f9a63603 Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Fri, 24 Apr 2020 19:12:03 -0700 Subject: [PATCH 22/23] wtfbbq --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 241f8e002..5fb8fd677 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,8 +54,8 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - run: | export IMAGE=docker.pkg.github.com/cloudfire-llc/cloudfire-ce/cloudfire:${GITHUB_SHA::8} - docker build -t $IMAGE . - docker push $IMAGE + docker build -t ${IMAGE} . + docker push ${IMAGE} # 3. Functional Test docker-compose-up: From c3cff05902072c85b03ab21737e8faba4bf13b39 Mon Sep 17 00:00:00 2001 From: Jamil Bou Kheir Date: Fri, 24 Apr 2020 19:25:34 -0700 Subject: [PATCH 23/23] wtf is wrong --- .github/workflows/main.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5fb8fd677..5ac8a5c56 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -52,10 +52,11 @@ jobs: login-server: docker.pkg.github.com username: $GITHUB_ACTOR password: ${{ secrets.GITHUB_TOKEN }} - - run: | - export IMAGE=docker.pkg.github.com/cloudfire-llc/cloudfire-ce/cloudfire:${GITHUB_SHA::8} - docker build -t ${IMAGE} . - docker push ${IMAGE} + - name: Build and push + run: | + export IMAGE="docker.pkg.github.com/cloudfire-llc/cloudfire-ce/cloudfire:${GITHUB_SHA::8}" + docker build -t $IMAGE . + docker push $IMAGE # 3. Functional Test docker-compose-up: