Skip to content

Commit 19fda83

Browse files
hotzevzlhotzevzl
committed
Merge branch 'develop' into staging
2 parents f5f1e84 + 2fc1029 commit 19fda83

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed

‎.github/workflows/deploy-to-kubernetes.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878

7979
- name: Add custom host data
8080
run: |
81-
sudo sh -c 'echo "127.0.0.1 ${{ env.AZURE_AKS_HOST }}" >> /etc/hosts'
81+
sudo sh -c 'echo "127.0.0.1 ${{ vars.AZURE_AKS_HOST }}" >> /etc/hosts'
8282
8383
- name: Install kubectl
8484
uses: azure/setup-kubectl@v3
@@ -88,12 +88,12 @@ jobs:
8888
- name: Config kubectl
8989
run: |
9090
mkdir ~/.kube
91-
az aks get-credentials --resource-group ${{ env.AZURE_RESOURCE_GROUP }} --name ${{ env.AZURE_AKS_CLUSTER_NAME }}
91+
az aks get-credentials --resource-group ${{ vars.AZURE_RESOURCE_GROUP }} --name ${{ vars.AZURE_AKS_CLUSTER_NAME }}
9292
sed -i 's/\([[:alnum:]]\+\?.privatelink.[[:alnum:]]\+\?.azmk8s.io\):443/\1:4433/g' ~/.kube/config
9393
9494
- name: Creating SSH tunnel
9595
run: |
96-
ssh -i ~/.ssh/bastion.key -o StrictHostKeyChecking=no -N -L 4433:${{ env.AZURE_AKS_HOST }}:443 ${{ env.BASTION_USER }}@${{ env.BASTION_HOST }} -T &
96+
ssh -i ~/.ssh/bastion.key -o StrictHostKeyChecking=no -N -L 4433:${{ vars.AZURE_AKS_HOST }}:443 ${{ vars.BASTION_USER }}@${{ vars.BASTION_HOST }} -T &
9797
9898
- name: Redeploy production pods
9999
if: ${{ github.ref == 'refs/heads/main' }}

‎.github/workflows/publish-marxan-docker-images.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ jobs:
6767
- name: Build and push image
6868
uses: azure/docker-login@v1
6969
with:
70-
login-server: ${{ env.REGISTRY_LOGIN_SERVER }}
71-
username: ${{ env.REGISTRY_USERNAME }}
70+
login-server: ${{ vars.REGISTRY_LOGIN_SERVER }}
71+
username: ${{ vars.REGISTRY_USERNAME }}
7272
password: ${{ secrets.REGISTRY_PASSWORD }}
7373

7474
- run: |
7575
docker build ./api -f api/api.Dockerfile \
76-
-t ${{ env.REGISTRY_LOGIN_SERVER }}/marxan-api:${{ github.sha }} \
77-
-t ${{ env.REGISTRY_LOGIN_SERVER }}/marxan-api:${{ github.ref != 'refs/heads/main' && 'staging' || 'production' }}
78-
docker push -a ${{ env.REGISTRY_LOGIN_SERVER }}/marxan-api
76+
-t ${{ vars.REGISTRY_LOGIN_SERVER }}/marxan-api:${{ github.sha }} \
77+
-t ${{ vars.REGISTRY_LOGIN_SERVER }}/marxan-api:${{ github.ref != 'refs/heads/main' && 'staging' || 'production' }}
78+
docker push -a ${{ vars.REGISTRY_LOGIN_SERVER }}/marxan-api
7979
8080
push_geoprocessing_to_registry:
8181
name: Push Geoprocessing Docker image to Azure Container Registry
@@ -95,15 +95,15 @@ jobs:
9595
- name: Build and push image
9696
uses: azure/docker-login@v1
9797
with:
98-
login-server: ${{ env.REGISTRY_LOGIN_SERVER }}
99-
username: ${{ env.REGISTRY_USERNAME }}
98+
login-server: ${{ vars.REGISTRY_LOGIN_SERVER }}
99+
username: ${{ vars.REGISTRY_USERNAME }}
100100
password: ${{ secrets.REGISTRY_PASSWORD }}
101101

102102
- run: |
103103
docker build ./api -f api/geo.Dockerfile \
104-
-t ${{ env.REGISTRY_LOGIN_SERVER }}/marxan-geoprocessing:${{ github.sha }} \
105-
-t ${{ env.REGISTRY_LOGIN_SERVER }}/marxan-geoprocessing:${{ github.ref != 'refs/heads/main' && 'staging' || 'production' }}
106-
docker push -a ${{ env.REGISTRY_LOGIN_SERVER }}/marxan-geoprocessing
104+
-t ${{ vars.REGISTRY_LOGIN_SERVER }}/marxan-geoprocessing:${{ github.sha }} \
105+
-t ${{ vars.REGISTRY_LOGIN_SERVER }}/marxan-geoprocessing:${{ github.ref != 'refs/heads/main' && 'staging' || 'production' }}
106+
docker push -a ${{ vars.REGISTRY_LOGIN_SERVER }}/marxan-geoprocessing
107107
108108
push_client_to_registry:
109109
name: Push Client Docker image to Azure Container Registry
@@ -124,19 +124,19 @@ jobs:
124124
- name: Build and push image
125125
uses: azure/docker-login@v1
126126
with:
127-
login-server: ${{ env.REGISTRY_LOGIN_SERVER }}
128-
username: ${{ env.REGISTRY_USERNAME }}
127+
login-server: ${{ vars.REGISTRY_LOGIN_SERVER }}
128+
username: ${{ vars.REGISTRY_USERNAME }}
129129
password: ${{ secrets.REGISTRY_PASSWORD }}
130130

131131
- run: |
132132
docker build ./app \
133-
-t ${{ env.REGISTRY_LOGIN_SERVER }}/marxan-client:${{ github.sha }} \
134-
-t ${{ env.REGISTRY_LOGIN_SERVER }}/marxan-client:${{ github.ref != 'refs/heads/main' && 'staging' || 'production' }} \
135-
--build-arg NEXT_PUBLIC_URL=${{ github.ref != 'refs/heads/main' && env.NEXT_PUBLIC_URL_STAGING || env.NEXT_PUBLIC_URL_PRODUCTION }} \
136-
--build-arg NEXT_PUBLIC_API_URL=${{ github.ref != 'refs/heads/main' && env.NEXT_PUBLIC_API_URL_STAGING || env.NEXT_PUBLIC_API_URL_PRODUCTION }} \
137-
--build-arg NEXTAUTH_URL=${{ github.ref != 'refs/heads/main' && env.NEXTAUTH_URL_STAGING || env.NEXTAUTH_URL_PRODUCTION }} \
138-
--build-arg NEXT_PUBLIC_FEATURE_FLAGS=${{ github.ref != 'refs/heads/main' && env.NEXT_PUBLIC_FEATURE_FLAGS_STAGING || env.NEXT_PUBLIC_FEATURE_FLAGS_PRODUCTION }} \
139-
--build-arg NEXT_PUBLIC_MAPBOX_API_TOKEN=${{ env.NEXT_PUBLIC_MAPBOX_API_TOKEN }} \
133+
-t ${{ vars.REGISTRY_LOGIN_SERVER }}/marxan-client:${{ github.sha }} \
134+
-t ${{ vars.REGISTRY_LOGIN_SERVER }}/marxan-client:${{ github.ref != 'refs/heads/main' && 'staging' || 'production' }} \
135+
--build-arg NEXT_PUBLIC_URL=${{ github.ref != 'refs/heads/main' && vars.NEXT_PUBLIC_URL_STAGING || vars.NEXT_PUBLIC_URL_PRODUCTION }} \
136+
--build-arg NEXT_PUBLIC_API_URL=${{ github.ref != 'refs/heads/main' && vars.NEXT_PUBLIC_API_URL_STAGING || vars.NEXT_PUBLIC_API_URL_PRODUCTION }} \
137+
--build-arg NEXTAUTH_URL=${{ github.ref != 'refs/heads/main' && vars.NEXTAUTH_URL_STAGING || vars.NEXTAUTH_URL_PRODUCTION }} \
138+
--build-arg NEXT_PUBLIC_FEATURE_FLAGS=${{ github.ref != 'refs/heads/main' && vars.NEXT_PUBLIC_FEATURE_FLAGS_STAGING || vars.NEXT_PUBLIC_FEATURE_FLAGS_PRODUCTION }} \
139+
--build-arg NEXT_PUBLIC_MAPBOX_API_TOKEN=${{ vars.NEXT_PUBLIC_MAPBOX_API_TOKEN }} \
140140
--build-arg ENABLE_MAINTENANCE_MODE=${{ github.event.inputs.enable_maintenance_mode }} \
141-
--build-arg NEXT_PUBLIC_CONTACT_EMAIL=${{ env.NEXT_PUBLIC_CONTACT_EMAIL }}
142-
docker push -a ${{ env.REGISTRY_LOGIN_SERVER }}/marxan-client
141+
--build-arg NEXT_PUBLIC_CONTACT_EMAIL=${{ vars.NEXT_PUBLIC_CONTACT_EMAIL }}
142+
docker push -a ${{ vars.REGISTRY_LOGIN_SERVER }}/marxan-client

‎.github/workflows/publish-webshot-docker-images.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ jobs:
3434
- name: Build and push image
3535
uses: azure/docker-login@v1
3636
with:
37-
login-server: ${{ env.REGISTRY_LOGIN_SERVER }}
38-
username: ${{ env.REGISTRY_USERNAME }}
37+
login-server: ${{ vars.REGISTRY_LOGIN_SERVER }}
38+
username: ${{ vars.REGISTRY_USERNAME }}
3939
password: ${{ secrets.REGISTRY_PASSWORD }}
4040

4141
- run: |
4242
docker build ./webshot \
43-
-t ${{ env.REGISTRY_LOGIN_SERVER }}/marxan-webshot:${{ github.sha }} \
44-
-t ${{ env.REGISTRY_LOGIN_SERVER }}/marxan-webshot:${{ github.ref != 'refs/heads/main' && 'staging' || 'production' }}
45-
docker push -a ${{ env.REGISTRY_LOGIN_SERVER }}/marxan-webshot
43+
-t ${{ vars.REGISTRY_LOGIN_SERVER }}/marxan-webshot:${{ github.sha }} \
44+
-t ${{ vars.REGISTRY_LOGIN_SERVER }}/marxan-webshot:${{ github.ref != 'refs/heads/main' && 'staging' || 'production' }}
45+
docker push -a ${{ vars.REGISTRY_LOGIN_SERVER }}/marxan-webshot

0 commit comments

Comments
 (0)