Skip to content

Commit 8983601

Browse files
Jonsy13Jonsy13
authored
Enable Dex Server builds in PR checks and Push pipelines (#5134)
* Enable Dex Server builds Signed-off-by: Jonsy13 <[email protected]> * Enable Dex Server builds Signed-off-by: Jonsy13 <[email protected]> * Enable Dex Server builds Signed-off-by: Jonsy13 <[email protected]> * Enable Dex Server builds Signed-off-by: Jonsy13 <[email protected]> * Enable Dex Server builds Signed-off-by: Jonsy13 <[email protected]> * Enable Dex Server builds Signed-off-by: Jonsy13 <[email protected]> * Enable Dex Server builds Signed-off-by: Jonsy13 <[email protected]> --------- Signed-off-by: Jonsy13 <[email protected]>
1 parent 2ab209a commit 8983601

File tree

4 files changed

+70
-50
lines changed

4 files changed

+70
-50
lines changed

‎.github/workflows/build.yml‎

Lines changed: 28 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ jobs:
1818
authentication: ${{ steps.filter.outputs.authentication }}
1919
subscriber: ${{ steps.filter.outputs.subscriber }}
2020
event-tracker: ${{ steps.filter.outputs.event-tracker }}
21-
# upgrade-agent-cp: ${{ steps.filter.outputs.upgrade-agent-cp }}
22-
# dex-server: ${{ steps.filter.outputs.dex-server }}
21+
dex-server: ${{ steps.filter.outputs.dex-server }}
2322
steps:
2423
# For pull requests it's not necessary to checkout the code
2524
- uses: dorny/paths-filter@v3
@@ -36,10 +35,8 @@ jobs:
3635
- 'chaoscenter/subscriber/**'
3736
event-tracker:
3837
- 'chaoscenter/event-tracker/**'
39-
# upgrade-agent-cp:
40-
# - 'chaoscenter/upgrade-agents/control-plane/**'
41-
# dex-server:
42-
# - 'chaoscenter/dex-server/**'
38+
dex-server:
39+
- 'chaoscenter/dex-server/**'
4340
4441
gitleaks-scan:
4542
runs-on: ubuntu-latest
@@ -56,7 +53,7 @@ jobs:
5653
backend-checks:
5754
runs-on: ubuntu-latest
5855
needs: changes
59-
if: needs.changes.outputs.graphql-server == 'true' || needs.changes.outputs.authentication == 'true' || needs.changes.outputs.subscriber == 'true' || needs.changes.outputs.event-tracker == 'true'
56+
if: needs.changes.outputs.graphql-server == 'true' || needs.changes.outputs.authentication == 'true' || needs.changes.outputs.subscriber == 'true' || needs.changes.outputs.event-tracker == 'true' || needs.changes.outputs.dex-server == 'true'
6057
steps:
6158
- name: Checkout repository
6259
uses: actions/checkout@v4
@@ -264,43 +261,28 @@ jobs:
264261
vuln-type: 'os,library'
265262
severity: 'CRITICAL,HIGH'
266263

267-
# docker-build-upgrade-agent-cp:
268-
# runs-on: ubuntu-latest
269-
# needs:
270-
# - backend-checks
271-
# - changes
272-
# - backend-unit-tests
273-
# if: ${{ needs.changes.outputs.upgrade-agent-cp == 'true' }}
274-
# steps:
275-
# - name: Checkout code
276-
# uses: actions/checkout@v2
277-
# - name: Build control plane upgrade agent docker image
278-
# shell: bash
279-
# run: |
280-
# cd chaoscenter/upgrade-agents/control-plane
281-
# docker build . -f Dockerfile -t docker.io/litmuschaos/upgrade-agent-cp:${{ github.sha }} --build-arg TARGETARCH=amd64
282-
# - name: Run Trivy vulnerability scanner
283-
# uses: aquasecurity/trivy-action@master
284-
# with:
285-
# image-ref: 'docker.io/litmuschaos/upgrade-agent-cp:${{ github.sha }}'
286-
# format: 'table'
287-
# exit-code: '1'
288-
# ignore-unfixed: true
289-
# vuln-type: 'os,library'
290-
# severity: 'CRITICAL,HIGH'
264+
docker-build-dex-server:
265+
runs-on: ubuntu-latest
266+
needs:
267+
- backend-checks
268+
- changes
269+
if: ${{ needs.changes.outputs.dex-server == 'true' }}
270+
steps:
271+
- name: Checkout code
272+
uses: actions/checkout@v4
291273

292-
# docker-build-dex-server:
293-
# runs-on: ubuntu-latest
294-
# needs:
295-
# - backend-checks
296-
# - changes
297-
# - backend-unit-tests
298-
# if: needs.changes.outputs.dex-server == 'true'
299-
# steps:
300-
# - name: Checkout code
301-
# uses: actions/checkout@v2
302-
# - name: Build dex-server docker image
303-
# shell: bash
304-
# run: |
305-
# cd chaoscenter/dex-server
306-
# docker images && docker build . -f Dockerfile --build-arg TARGETARCH=amd64
274+
- name: Build dex-server docker image
275+
shell: bash
276+
run: |
277+
cd chaoscenter/dex-server
278+
docker images && docker build . -f Dockerfile -t docker.io/litmuschaos/litmusportal-dex-server:${{ github.sha }} --build-arg TARGETARCH=amd64
279+
280+
- name: Run Trivy vulnerability scanner
281+
uses: aquasecurity/trivy-action@master
282+
with:
283+
image-ref: 'docker.io/litmuschaos/litmusportal-dex-server:${{ github.sha }}'
284+
format: 'table'
285+
exit-code: '0'
286+
ignore-unfixed: true
287+
vuln-type: 'os,library'
288+
severity: 'CRITICAL,HIGH'

‎.github/workflows/push.yml‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ jobs:
5959
echo export FRONTEND_IMAGE="litmusportal-frontend" >> env-vars
6060
echo export SUBSCRIBER_IMAGE="litmusportal-subscriber" >> env-vars
6161
echo export EVENT_TRACKER="litmusportal-event-tracker" >> env-vars
62-
# echo export UPGRADE_AGENT_CP="upgrade-agent-cp" >> env-vars
63-
# echo export DEX_SERVER="litmusportal-dex-server" >> env-vars
62+
echo export DEX_SERVER="litmusportal-dex-server" >> env-vars
6463
6564
- name: Uploading envs
6665
uses: actions/upload-artifact@v4
@@ -280,3 +279,42 @@ jobs:
280279
FRONTEND_IMAGE=${{ matrix.frontend.image_name }}
281280
timestamp=`date "+%s"`
282281
make push-frontend
282+
283+
284+
docker-build-and-push-dex-server:
285+
runs-on: ubuntu-latest
286+
needs:
287+
- get-envs
288+
- backend-checks
289+
steps:
290+
- name: Checkout code
291+
uses: actions/checkout@v4
292+
293+
- name: Set up Docker Buildx
294+
id: buildx
295+
uses: docker/setup-buildx-action@v1
296+
with:
297+
version: latest
298+
299+
- name: Set up Docker Buildx
300+
id: buildx
301+
uses: docker/setup-buildx-action@v1
302+
with:
303+
version: latest
304+
305+
- name: Login to DockerHub
306+
uses: docker/login-action@v1
307+
with:
308+
username: ${{ secrets.DOCKERHUB_USERNAME }}
309+
password: ${{ secrets.DOCKERHUB_TOKEN }}
310+
311+
- name: Push dex server docker image
312+
env:
313+
IMAGE_NAME: ${DEX_SERVER}
314+
IMG_TAG: ${IMG_TAG}
315+
PLATFORMS: ${{ secrets.PLATFORMS }}
316+
REPONAME: ${{ secrets.REPONAME }}
317+
DIRECTORY: "dex-server"
318+
run: |
319+
source env-vars
320+
make push-portal-component

‎chaoscenter/dex-server/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FROM ghcr.io/dexidp/dex:latest
1+
FROM ghcr.io/dexidp/dex:v2.43.0
22
ENV DEX_FRONTEND_DIR=/srv/dex/web
33
COPY --chown=root:root web /srv/dex/web

‎chaoscenter/dex-server/web/web.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
//go:embed static/* templates/* themes/*
99
var files embed.FS
1010

11-
// FS returns a filesystem with the default web assets.
11+
// FS returns a filesystem with the default web assets
1212
func FS() fs.FS {
1313
return files
1414
}

0 commit comments

Comments
 (0)