Skip to content

Commit 15ab587

Browse files
committed
fix: add PR to build all Dockers
1 parent 8454a5f commit 15ab587

File tree

4 files changed

+43
-39
lines changed

4 files changed

+43
-39
lines changed

.github/workflows/dockers_builder.yml

+38-37
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Build Navitia Dockers
22

33
on:
4+
pull_request:
45
push:
56
branches:
67
- dev
@@ -185,7 +186,7 @@ jobs:
185186
- name: Create navitia images
186187
run: |
187188
echo "********* Building Tyr Web ***************"
188-
docker build -t navitia/$component --build-arg GITHUB_TOKEN=${{ steps.ci-core-app-token.outputs.token }} -f docker/debian11/Dockerfile-tyr-web .
189+
docker build -t navitia/tyr-web --build-arg GITHUB_TOKEN=${{ steps.ci-core-app-token.outputs.token }} -f docker/debian11/Dockerfile-tyr-web .
189190
190191
- name: Push dev images on SBX ECR
191192
if: github.ref == 'refs/heads/dev'
@@ -414,46 +415,46 @@ jobs:
414415
rm -rf ./.??*
415416
416417
417-
publish_aws:
418-
runs-on: [self-hosted, corefront, sandbox]
419-
name: Aws Dispatch (Dev)
420-
needs: [debian8_front_images, debian8_back_images, debian11_images, common_variables]
421-
steps:
422-
- name: Generate token for aws images
423-
id: app-token
424-
uses: getsentry/[email protected]
425-
with:
426-
app_id: ${{ secrets.GA_OS_WORKFLOW_TRIGGER_APP_ID }}
427-
private_key: ${{ secrets.GA_OS_WORKFLOW_TRIGGER_APP_PEM }}
428-
429-
- name: Aws Dispatch Frontend for dev
430-
if: github.ref == 'refs/heads/dev'
431-
uses: peter-evans/repository-dispatch@v2
432-
with:
433-
token: ${{ steps.app-token.outputs.token }}
434-
repository: hove-io/corefront-aws-assets
435-
event-type: build-trigger
436-
client-payload: '{"branch": "dev", "tag": "dev"}'
437-
438-
- name: Aws Dispatch Frontend for release
439-
if: startsWith(github.ref, 'refs/tags/')
440-
uses: peter-evans/repository-dispatch@v2
441-
with:
442-
token: ${{ steps.app-token.outputs.token }}
443-
repository: hove-io/corefront-aws-assets
444-
event-type: build-trigger
445-
client-payload: '{"branch": "release", "tag": "${{ needs.common_variables.outputs.RELEASE_TAG }}"}'
446-
447-
- name: failure notification
448-
if: failure()
449-
run: |
450-
sudo apt update && sudo apt install -y httpie
451-
echo '{"text":":warning: Github Actions: dockers_builder the job publish_aws failed !"}' | http --json POST ${{secrets.SLACK_NAVITIA_TEAM_URL}}
418+
# publish_aws:
419+
# runs-on: [self-hosted, corefront, sandbox]
420+
# name: Aws Dispatch (Dev)
421+
# needs: [debian8_front_images, debian8_back_images, debian11_images, common_variables]
422+
# steps:
423+
# - name: Generate token for aws images
424+
# id: app-token
425+
# uses: getsentry/[email protected]
426+
# with:
427+
# app_id: ${{ secrets.GA_OS_WORKFLOW_TRIGGER_APP_ID }}
428+
# private_key: ${{ secrets.GA_OS_WORKFLOW_TRIGGER_APP_PEM }}
429+
430+
# - name: Aws Dispatch Frontend for dev
431+
# if: github.ref == 'refs/heads/dev'
432+
# uses: peter-evans/repository-dispatch@v2
433+
# with:
434+
# token: ${{ steps.app-token.outputs.token }}
435+
# repository: hove-io/corefront-aws-assets
436+
# event-type: build-trigger
437+
# client-payload: '{"branch": "dev", "tag": "dev"}'
438+
439+
# - name: Aws Dispatch Frontend for release
440+
# if: startsWith(github.ref, 'refs/tags/')
441+
# uses: peter-evans/repository-dispatch@v2
442+
# with:
443+
# token: ${{ steps.app-token.outputs.token }}
444+
# repository: hove-io/corefront-aws-assets
445+
# event-type: build-trigger
446+
# client-payload: '{"branch": "release", "tag": "${{ needs.common_variables.outputs.RELEASE_TAG }}"}'
447+
448+
# - name: failure notification
449+
# if: failure()
450+
# run: |
451+
# sudo apt update && sudo apt install -y httpie
452+
# echo '{"text":":warning: Github Actions: dockers_builder the job publish_aws failed !"}' | http --json POST ${{secrets.SLACK_NAVITIA_TEAM_URL}}
452453

453454

454455
run_artemis:
455456
runs-on: [self-hosted, corefront, sandbox]
456-
needs: [publish_aws]
457+
needs: [debian11_back_images, debian11_front_images]
457458
name: Run artemis Dispatch (Dev)
458459
if: github.ref == 'refs/heads/dev'
459460
steps:

.github/workflows/workflow.yml

+1
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ jobs:
156156
if: ${{ matrix.os.docker_image == 'mutable-debian8_dev'}}
157157
run: |
158158
apt remove --yes cmake
159+
apt install wget -y
159160
mkdir local_bin
160161
cd local_bin
161162
wget https://cmake.org/files/v3.18/cmake-3.18.6-Linux-x86_64.tar.gz

docker/debian11/Dockerfile-master

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ RUN apt-get install -y --force-yes ca-certificates \
1212
postgresql-client \
1313
netcat \
1414
dh-python \
15-
curl
15+
curl \
16+
wget
1617

1718
COPY docker/ca-certificates/*.crt /usr/local/share/ca-certificates/
1819
RUN update-ca-certificates

docker/debian8/Dockerfile-master

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ RUN apt-get install -y --force-yes ca-certificates \
1212
postgresql-client \
1313
netcat \
1414
dh-python \
15-
curl
15+
curl \
16+
wget
1617

1718
COPY docker/ca-certificates/*.crt /usr/local/share/ca-certificates/
1819
RUN update-ca-certificates

0 commit comments

Comments
 (0)