Skip to content

Commit e502cae

Browse files
aaboyle878aaboyle878
authored
Merge pull request #4128 from IntersectMBO/chore/workflows
Chore/workflows
2 parents c787fdf + 070392c commit e502cae

File tree

2 files changed

+73
-97
lines changed

2 files changed

+73
-97
lines changed

‎.github/workflows/build-from-main.yml‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,6 @@ jobs:
4040
dockerfile: ./govtool/metadata-validation/Dockerfile
4141
image: ghcr.io/${{ github.repository }}-metadata-validation
4242
qovery_container_name: govtool-metadata-validation
43-
- branch: main
44-
network: pre-prod-govtool
45-
workdir: ./govtool/backend
46-
name: govtool-backend
47-
dockerfile: ./govtool/backend/Dockerfile.qovery
48-
image: ghcr.io/${{ github.repository }}-backend
49-
qovery_container_name: govtool-backend
50-
- branch: main
51-
network: pre-prod-govtool
52-
workdir: ./govtool/frontend
53-
name: govtool-frontend
54-
dockerfile: ./govtool/frontend/Dockerfile.qovery
55-
image: ghcr.io/${{ github.repository }}-frontend
56-
qovery_container_name: govtool-frontend
57-
- branch: main
58-
network: pre-prod-govtool
59-
workdir: ./govtool/metadata-validation
60-
name: govtool-metadata-validation
61-
dockerfile: ./govtool/metadata-validation/Dockerfile
62-
image: ghcr.io/${{ github.repository }}-metadata-validation
63-
qovery_container_name: govtool-metadata-validation
6443
- branch: main
6544
network: prod-govtool
6645
workdir: ./govtool/backend

‎.github/workflows/build-from-test.yml‎

Lines changed: 73 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
name: Check and Build QA
22

33
on:
4-
push:
5-
branches:
6-
- test
74
workflow_dispatch:
85

96
permissions:
@@ -131,80 +128,80 @@ jobs:
131128
CLEAN_NETWORK=$(echo "${{ matrix.network }}" | sed 's/-govtool$//')
132129
echo "CLEAN_NETWORK=$CLEAN_NETWORK" >> $GITHUB_ENV
133130
134-
- name: Build Docker image
135-
uses: docker/build-push-action@v5
136-
with:
137-
context: ${{ matrix.workdir }}
138-
file: ${{ matrix.dockerfile }}
139-
tags: >
140-
${{ steps.image_lowercase.outputs.lowercase }}-${{ env.CLEAN_NETWORK }}:${{ env.COMMIT_TAG }},
141-
${{ steps.image_lowercase.outputs.lowercase }}-${{ env.CLEAN_NETWORK }}:${{ env.STATIC_TAG }}
142-
load: false
143-
cache-from: type=local,src=/tmp/.buildx-cache
144-
cache-to: type=local,dest=/tmp/.buildx-cache
145-
outputs: type=docker,dest=/tmp/image-${{ matrix.name }}-${{ env.ENVIRONMENT }}.tar
146-
build-args: |
147-
VITE_APP_ENV=${{ secrets.VITE_APP_ENV }}
148-
VITE_BASE_URL=${{ secrets.VITE_BASE_URL }}
149-
VITE_METADATA_API_URL=${{ secrets.VITE_METADATA_API_URL }}
150-
VITE_NETWORK_FLAG=${{ secrets.VITE_NETWORK_FLAG }}
151-
VITE_SENTRY_DSN=${{ secrets.VITE_SENTRY_DSN }}
152-
VITE_USERSNAP_SPACE_API_KEY=${{ secrets.VITE_USERSNAP_SPACE_API_KEY }}
153-
VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED=${{ secrets.VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED }}
154-
VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED=${{ secrets.VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED }}
155-
VITE_OUTCOMES_API_URL=${{secrets.VITE_OUTCOMES_API_URL}}
156-
VITE_PDF_API_URL=${{ secrets.VITE_PDF_API_URL }}
157-
VITE_IPFS_GATEWAY=${{ secrets.IPFS_GATEWAY }}
158-
VITE_IPFS_PROJECT_ID=${{ secrets.IPFS_PROJECT_ID }}
159-
IPFS_GATEWAY=${{ secrets.IPFS_GATEWAY }}
160-
IPFS_PROJECT_ID=${{ secrets.IPFS_PROJECT_ID }}
161-
162-
- name: Login to GHCR
163-
uses: docker/login-action@v2
164-
with:
165-
registry: ghcr.io
166-
username: ${{ github.actor }}
167-
password: ${{ secrets.GITHUB_TOKEN }}
168-
169-
- name: Scan Docker image with Dockle
170-
id: dockle
171-
run: |
172-
wget -q https://github.com/goodwithtech/dockle/releases/download/v0.4.14/dockle_0.4.14_Linux-64bit.tar.gz
173-
tar zxf dockle_0.4.14_Linux-64bit.tar.gz
174-
sudo mv dockle /usr/local/bin
175-
176-
dockle --exit-code 1 --exit-level fatal --format json -ak GHC_RELEASE_KEY -ak CABAL_INSTALL_RELEASE_KEY -ak STACK_RELEASE_KEY -ak KEY_SHA512 --input '/tmp/image-${{ matrix.name }}-${{ env.ENVIRONMENT }}.tar' --output ${{ matrix.workdir }}/dockle_scan_output.json
177-
echo " dockle exited w/ $?"
178-
cat ${{ matrix.workdir }}/dockle_scan_output.json
179-
180-
echo "outcome=success" >> $GITHUB_OUTPUT
181-
182-
- name: Debug TAG Before Docker Push
183-
run: |
184-
echo "Lowercase Image: ${{ steps.image_lowercase.outputs.lowercase }}"
185-
echo "Network: ${{ matrix.network }}"
186-
echo "COMMIT_TAG: ${{ env.COMMIT_TAG }}"
187-
echo "STATIC_TAG: ${{ env.STATIC_TAG }}"
188-
echo "Final Docker Tag: ${{ steps.image_lowercase.outputs.lowercase }}-${{ matrix.network}}:${{ env.TAG }}"
131+
# - name: Build Docker image
132+
# uses: docker/build-push-action@v5
133+
# with:
134+
# context: ${{ matrix.workdir }}
135+
# file: ${{ matrix.dockerfile }}
136+
# tags: >
137+
# ${{ steps.image_lowercase.outputs.lowercase }}-${{ env.CLEAN_NETWORK }}:${{ env.COMMIT_TAG }},
138+
# ${{ steps.image_lowercase.outputs.lowercase }}-${{ env.CLEAN_NETWORK }}:${{ env.STATIC_TAG }}
139+
# load: false
140+
# cache-from: type=local,src=/tmp/.buildx-cache
141+
# cache-to: type=local,dest=/tmp/.buildx-cache
142+
# outputs: type=docker,dest=/tmp/image-${{ matrix.name }}-${{ env.ENVIRONMENT }}.tar
143+
# build-args: |
144+
# VITE_APP_ENV=${{ secrets.VITE_APP_ENV }}
145+
# VITE_BASE_URL=${{ secrets.VITE_BASE_URL }}
146+
# VITE_METADATA_API_URL=${{ secrets.VITE_METADATA_API_URL }}
147+
# VITE_NETWORK_FLAG=${{ secrets.VITE_NETWORK_FLAG }}
148+
# VITE_SENTRY_DSN=${{ secrets.VITE_SENTRY_DSN }}
149+
# VITE_USERSNAP_SPACE_API_KEY=${{ secrets.VITE_USERSNAP_SPACE_API_KEY }}
150+
# VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED=${{ secrets.VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED }}
151+
# VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED=${{ secrets.VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED }}
152+
# VITE_OUTCOMES_API_URL=${{secrets.VITE_OUTCOMES_API_URL}}
153+
# VITE_PDF_API_URL=${{ secrets.VITE_PDF_API_URL }}
154+
# VITE_IPFS_GATEWAY=${{ secrets.IPFS_GATEWAY }}
155+
# VITE_IPFS_PROJECT_ID=${{ secrets.IPFS_PROJECT_ID }}
156+
# IPFS_GATEWAY=${{ secrets.IPFS_GATEWAY }}
157+
# IPFS_PROJECT_ID=${{ secrets.IPFS_PROJECT_ID }}
158+
159+
# - name: Login to GHCR
160+
# uses: docker/login-action@v2
161+
# with:
162+
# registry: ghcr.io
163+
# username: ${{ github.actor }}
164+
# password: ${{ secrets.GITHUB_TOKEN }}
165+
166+
# - name: Scan Docker image with Dockle
167+
# id: dockle
168+
# run: |
169+
# wget -q https://github.com/goodwithtech/dockle/releases/download/v0.4.14/dockle_0.4.14_Linux-64bit.tar.gz
170+
# tar zxf dockle_0.4.14_Linux-64bit.tar.gz
171+
# sudo mv dockle /usr/local/bin
172+
173+
# dockle --exit-code 1 --exit-level fatal --format json -ak GHC_RELEASE_KEY -ak CABAL_INSTALL_RELEASE_KEY -ak STACK_RELEASE_KEY -ak KEY_SHA512 --input '/tmp/image-${{ matrix.name }}-${{ env.ENVIRONMENT }}.tar' --output ${{ matrix.workdir }}/dockle_scan_output.json
174+
# echo " dockle exited w/ $?"
175+
# cat ${{ matrix.workdir }}/dockle_scan_output.json
176+
177+
# echo "outcome=success" >> $GITHUB_OUTPUT
178+
179+
# - name: Debug TAG Before Docker Push
180+
# run: |
181+
# echo "Lowercase Image: ${{ steps.image_lowercase.outputs.lowercase }}"
182+
# echo "Network: ${{ matrix.network }}"
183+
# echo "COMMIT_TAG: ${{ env.COMMIT_TAG }}"
184+
# echo "STATIC_TAG: ${{ env.STATIC_TAG }}"
185+
# echo "Final Docker Tag: ${{ steps.image_lowercase.outputs.lowercase }}-${{ matrix.network}}:${{ env.TAG }}"
189186

190-
- name: Push Docker image to GHCR
191-
run: |
192-
docker load -i '/tmp/image-${{ matrix.name }}-${{ env.ENVIRONMENT }}.tar'
193-
rm -rf '/tmp/image-${{ matrix.name }}-${{ env.ENVIRONMENT }}.tar'
194-
docker push ${{ steps.image_lowercase.outputs.lowercase }}-${{ env.CLEAN_NETWORK}}:${{ env.COMMIT_TAG }}
195-
196-
- name: Sleep for 20 Seconds
197-
run: sleep 20
198-
199-
- name: Notify Qovery of new image tag
200-
run: |
201-
curl -i -X POST https://api.qovery.com/organization/${{ secrets.QOVERY_ORG_ID }}/container/deploy \
202-
-H "Authorization: Token ${{ secrets.QOVERY_API_TOKEN }}" \
203-
-H "Content-Type: application/json" \
204-
-d '{
205-
"image_name": "intersectmbo/${{ matrix.name }}-${{ env.CLEAN_NETWORK }}",
206-
"tag": "${{ env.COMMIT_TAG }}"
207-
}'
187+
# - name: Push Docker image to GHCR
188+
# run: |
189+
# docker load -i '/tmp/image-${{ matrix.name }}-${{ env.ENVIRONMENT }}.tar'
190+
# rm -rf '/tmp/image-${{ matrix.name }}-${{ env.ENVIRONMENT }}.tar'
191+
# docker push ${{ steps.image_lowercase.outputs.lowercase }}-${{ env.CLEAN_NETWORK}}:${{ env.COMMIT_TAG }}
192+
193+
# - name: Sleep for 20 Seconds
194+
# run: sleep 20
195+
196+
# - name: Notify Qovery of new image tag
197+
# run: |
198+
# curl -i -X POST https://api.qovery.com/organization/${{ secrets.QOVERY_ORG_ID }}/container/deploy \
199+
# -H "Authorization: Token ${{ secrets.QOVERY_API_TOKEN }}" \
200+
# -H "Content-Type: application/json" \
201+
# -d '{
202+
# "image_name": "intersectmbo/${{ matrix.name }}-${{ env.CLEAN_NETWORK }}",
203+
# "tag": "${{ env.COMMIT_TAG }}"
204+
# }'
208205

209206
- name: Add tag as a PR comment
210207
uses: ubie-oss/[email protected]

0 commit comments

Comments
 (0)