Skip to content

Commit 358ee3c

Browse files
Merge pull request #38 from francesconazzaro/main
Migrate to ECMWF harbor
2 parents 40cd671 + fefbca0 commit 358ee3c

21 files changed

+20
-188
lines changed

.github/workflows/build-broker-exporter.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ jobs:
1616
- name: Set up QEMU
1717
uses: docker/setup-qemu-action@v2
1818

19-
- name: Setup harbor ca certificate from secret
20-
run: |
21-
ls /etc/docker
22-
sudo mkdir -p /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"
23-
echo "${{ secrets.HARBOR_CERT }}" | sudo tee /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt >/dev/null
24-
- name: Copy ca cert
25-
run: |
26-
sudo cp /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt /etc/ssl/certs/ca-certificates.crt
2719
- name: Login to harbor registry
2820
uses: docker/login-action@v2
2921
with:
@@ -63,5 +55,5 @@ jobs:
6355
with:
6456
context: .
6557
push: true
66-
tags: ${{ secrets.HARBOR_IP }}/cads-dev-env/cads-broker-exporter:${{ github.event.inputs.image_tag }}
58+
tags: ${{ secrets.HARBOR_IP }}/cads/cads-broker-exporter:${{ github.event.inputs.image_tag }}
6759
file: Dockerfile

.github/workflows/build-broker.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,6 @@ jobs:
2525
- name: Set up QEMU
2626
uses: docker/setup-qemu-action@v2
2727

28-
- name: Setup harbor ca certificate from secret
29-
run: |
30-
ls /etc/docker
31-
sudo mkdir -p /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"
32-
echo "${{ secrets.HARBOR_CERT }}" | sudo tee /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt >/dev/null
33-
- name: Copy ca cert
34-
run: |
35-
sudo cp /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt /etc/ssl/certs/ca-certificates.crt
3628
- name: Login to harbor registry
3729
uses: docker/login-action@v2
3830
with:
@@ -99,5 +91,5 @@ jobs:
9991
with:
10092
context: docker
10193
push: true
102-
tags: ${{ secrets.HARBOR_IP }}/cads-dev-env/broker:${{ github.event.inputs.image_tag }}
94+
tags: ${{ secrets.HARBOR_IP }}/cads/broker:${{ github.event.inputs.image_tag }}
10395
file: docker/broker/Dockerfile

.github/workflows/build-cache-cleaner.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@ jobs:
2424
- name: Set up QEMU
2525
uses: docker/setup-qemu-action@v2
2626

27-
- name: Setup harbor ca certificate from secret
28-
run: |
29-
ls /etc/docker
30-
sudo mkdir -p /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"
31-
echo "${{ secrets.HARBOR_CERT }}" | sudo tee /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt >/dev/null
32-
- name: Copy ca cert
33-
run: |
34-
sudo cp /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt /etc/ssl/certs/ca-certificates.crt
3527
- name: Login to harbor registry
3628
uses: docker/login-action@v2
3729
with:
@@ -93,5 +85,5 @@ jobs:
9385
with:
9486
context: docker
9587
push: true
96-
tags: ${{ secrets.HARBOR_IP }}/cads-dev-env/cache-cleaner:${{ github.event.inputs.image_tag }}
88+
tags: ${{ secrets.HARBOR_IP }}/cads/cache-cleaner:${{ github.event.inputs.image_tag }}
9789
file: docker/cache-cleaner/Dockerfile

.github/workflows/build-canary-microservice.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ jobs:
1616
- name: Set up QEMU
1717
uses: docker/setup-qemu-action@v2
1818

19-
- name: Setup harbor ca certificate from secret
20-
run: |
21-
ls /etc/docker
22-
sudo mkdir -p /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"
23-
echo "${{ secrets.HARBOR_CERT }}" | sudo tee /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt >/dev/null
24-
- name: Copy ca cert
25-
run: |
26-
sudo cp /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt /etc/ssl/certs/ca-certificates.crt
2719
- name: Login to harbor registry
2820
uses: docker/login-action@v2
2921
with:
@@ -64,5 +56,5 @@ jobs:
6456
with:
6557
context: .
6658
push: true
67-
tags: ${{ secrets.HARBOR_IP }}/cads-dev-env/canary-microservice:${{ github.event.inputs.image_tag }}
59+
tags: ${{ secrets.HARBOR_IP }}/cads/canary-microservice:${{ github.event.inputs.image_tag }}
6860
file: Dockerfile

.github/workflows/build-catalogue-api.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@ jobs:
2323
- name: Set up QEMU
2424
uses: docker/setup-qemu-action@v2
2525

26-
- name: Setup harbor ca certificate from secret
27-
run: |
28-
ls /etc/docker
29-
sudo mkdir -p /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"
30-
echo "${{ secrets.HARBOR_CERT }}" | sudo tee /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt >/dev/null
31-
- name: Copy ca cert
32-
run: |
33-
sudo cp /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt /etc/ssl/certs/ca-certificates.crt
3426
- name: Login to harbor registry
3527
uses: docker/login-action@v2
3628
with:
@@ -123,5 +115,5 @@ jobs:
123115
with:
124116
context: docker
125117
push: true
126-
tags: ${{ secrets.HARBOR_IP }}/cads-dev-env/catalogue-api:${{ github.event.inputs.image_tag }}
118+
tags: ${{ secrets.HARBOR_IP }}/cads/catalogue-api:${{ github.event.inputs.image_tag }}
127119
file: docker/catalogue-api/Dockerfile

.github/workflows/build-cim.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@ jobs:
2424
- name: Set up QEMU
2525
uses: docker/setup-qemu-action@v2
2626

27-
- name: Setup harbor ca certificate from secret
28-
run: |
29-
ls /etc/docker
30-
sudo mkdir -p /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"
31-
echo "${{ secrets.HARBOR_CERT }}" | sudo tee /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt >/dev/null
32-
- name: Copy ca cert
33-
run: |
34-
sudo cp /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt /etc/ssl/certs/ca-certificates.crt
3527
- name: Login to harbor registry
3628
uses: docker/login-action@v2
3729
with:

.github/workflows/build-csw-api.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@ jobs:
1919
- name: Set up QEMU
2020
uses: docker/setup-qemu-action@v2
2121

22-
- name: Setup harbor ca certificate from secret
23-
run: |
24-
ls /etc/docker
25-
sudo mkdir -p /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"
26-
echo "${{ secrets.HARBOR_CERT }}" | sudo tee /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt >/dev/null
27-
- name: Copy ca cert
28-
run: |
29-
sudo cp /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt /etc/ssl/certs/ca-certificates.crt
3022
- name: Login to harbor registry
3123
uses: docker/login-action@v2
3224
with:
@@ -64,5 +56,5 @@ jobs:
6456
with:
6557
context: ./pycsw-dynamic
6658
push: true
67-
tags: ${{ secrets.HARBOR_IP }}/cads-dev-env/csw-api:${{ github.event.inputs.image_tag }}
59+
tags: ${{ secrets.HARBOR_IP }}/cads/csw-api:${{ github.event.inputs.image_tag }}
6860
file: ./pycsw-dynamic/Dockerfile

.github/workflows/build-dask-mars.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@ jobs:
2323
- name: Set up QEMU
2424
uses: docker/setup-qemu-action@v2
2525

26-
- name: Setup harbor ca certificate from secret
27-
run: |
28-
ls /etc/docker
29-
sudo mkdir -p /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"
30-
echo "${{ secrets.HARBOR_CERT }}" | sudo tee /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt >/dev/null
31-
- name: Copy ca cert
32-
run: |
33-
sudo cp /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt /etc/ssl/certs/ca-certificates.crt
3426
- name: Login to harbor registry
3527
uses: docker/login-action@v2
3628
with:
@@ -86,5 +78,5 @@ jobs:
8678
with:
8779
context: docker
8880
push: true
89-
tags: ${{ secrets.HARBOR_IP }}/cads-dev-env/dask-mars:${{ github.event.inputs.image_tag }}
81+
tags: ${{ secrets.HARBOR_IP }}/cads/dask-mars:${{ github.event.inputs.image_tag }}
9082
file: docker/dask-mars/Dockerfile

.github/workflows/build-dev-explorer.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@ jobs:
2323
- name: Set up QEMU
2424
uses: docker/setup-qemu-action@v2
2525

26-
- name: Setup harbor ca certificate from secret
27-
run: |
28-
ls /etc/docker
29-
sudo mkdir -p /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"
30-
echo "${{ secrets.HARBOR_CERT }}" | sudo tee /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt >/dev/null
31-
- name: Copy ca cert
32-
run: |
33-
sudo cp /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt /etc/ssl/certs/ca-certificates.crt
3426
- name: Login to harbor registry
3527
uses: docker/login-action@v2
3628
with:
@@ -158,5 +150,5 @@ jobs:
158150
with:
159151
context: docker
160152
push: true
161-
tags: ${{ secrets.HARBOR_IP }}/cads-dev-env/dev-explorer:${{ github.event.inputs.image_tag }}
153+
tags: ${{ secrets.HARBOR_IP }}/cads/dev-explorer:${{ github.event.inputs.image_tag }}
162154
file: docker/dev-explorer/Dockerfile

.github/workflows/build-fluentd.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ jobs:
1616
- name: Set up QEMU
1717
uses: docker/setup-qemu-action@v2
1818

19-
- name: Setup harbor ca certificate from secret
20-
run: |
21-
ls /etc/docker
22-
sudo mkdir -p /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"
23-
echo "${{ secrets.HARBOR_CERT }}" | sudo tee /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt >/dev/null
24-
- name: Copy ca cert
25-
run: |
26-
sudo cp /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt /etc/ssl/certs/ca-certificates.crt
2719
- name: Login to harbor registry
2820
uses: docker/login-action@v2
2921
with:
@@ -63,5 +55,5 @@ jobs:
6355
with:
6456
context: .
6557
push: true
66-
tags: ${{ secrets.HARBOR_IP }}/cads-dev-env/cads-fluentd:${{ github.event.inputs.image_tag }}
58+
tags: ${{ secrets.HARBOR_IP }}/cads/cads-fluentd:${{ github.event.inputs.image_tag }}
6759
file: Dockerfile

.github/workflows/build-keycloak-db.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,6 @@ jobs:
2525
- name: Set up QEMU
2626
uses: docker/setup-qemu-action@v2
2727

28-
- name: Setup harbor ca certificate from secret
29-
run: |
30-
ls /etc/docker
31-
sudo mkdir -p /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"
32-
echo "${{ secrets.HARBOR_CERT }}" | sudo tee /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt >/dev/null
33-
- name: Copy ca cert
34-
run: |
35-
sudo cp /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt /etc/ssl/certs/ca-certificates.crt
3628
- name: Login to harbor registry
3729
uses: docker/login-action@v2
3830
with:
@@ -71,5 +63,5 @@ jobs:
7163
with:
7264
context: docker
7365
push: true
74-
tags: ${{ secrets.HARBOR_IP }}/cads-dev-env/cads-keycloak-db:${{ github.event.inputs.image_tag }}
66+
tags: ${{ secrets.HARBOR_IP }}/cads/cads-keycloak-db:${{ github.event.inputs.image_tag }}
7567
file: docker/keycloak-db/Dockerfile

.github/workflows/build-monitor-alert-log.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ jobs:
1616
- name: Set up QEMU
1717
uses: docker/setup-qemu-action@v2
1818

19-
- name: Setup harbor ca certificate from secret
20-
run: |
21-
ls /etc/docker
22-
sudo mkdir -p /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"
23-
echo "${{ secrets.HARBOR_CERT }}" | sudo tee /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt >/dev/null
24-
- name: Copy ca cert
25-
run: |
26-
sudo cp /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt /etc/ssl/certs/ca-certificates.crt
2719
- name: Login to harbor registry
2820
uses: docker/login-action@v2
2921
with:
@@ -63,5 +55,5 @@ jobs:
6355
with:
6456
context: .
6557
push: true
66-
tags: ${{ secrets.HARBOR_IP }}/cads-dev-env/cads-monitor-alert-log:${{ github.event.inputs.image_tag }}
58+
tags: ${{ secrets.HARBOR_IP }}/cads/cads-monitor-alert-log:${{ github.event.inputs.image_tag }}
6759
file: Dockerfile

.github/workflows/build-monitor-metrics.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ jobs:
1616
- name: Set up QEMU
1717
uses: docker/setup-qemu-action@v2
1818

19-
- name: Setup harbor ca certificate from secret
20-
run: |
21-
ls /etc/docker
22-
sudo mkdir -p /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"
23-
echo "${{ secrets.HARBOR_CERT }}" | sudo tee /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt >/dev/null
24-
- name: Copy ca cert
25-
run: |
26-
sudo cp /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt /etc/ssl/certs/ca-certificates.crt
2719
- name: Login to harbor registry
2820
uses: docker/login-action@v2
2921
with:
@@ -63,5 +55,5 @@ jobs:
6355
with:
6456
context: .
6557
push: true
66-
tags: ${{ secrets.HARBOR_IP }}/cads-dev-env/monitor-metrics:${{ github.event.inputs.image_tag }}
58+
tags: ${{ secrets.HARBOR_IP }}/cads/monitor-metrics:${{ github.event.inputs.image_tag }}
6759
file: Dockerfile

.github/workflows/build-monitor-nrpe.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ jobs:
1616
- name: Set up QEMU
1717
uses: docker/setup-qemu-action@v2
1818

19-
- name: Setup harbor ca certificate from secret
20-
run: |
21-
ls /etc/docker
22-
sudo mkdir -p /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"
23-
echo "${{ secrets.HARBOR_CERT }}" | sudo tee /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt >/dev/null
24-
- name: Copy ca cert
25-
run: |
26-
sudo cp /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt /etc/ssl/certs/ca-certificates.crt
2719
- name: Login to harbor registry
2820
uses: docker/login-action@v2
2921
with:
@@ -63,5 +55,5 @@ jobs:
6355
with:
6456
context: .
6557
push: true
66-
tags: ${{ secrets.HARBOR_IP }}/cads-dev-env/cads-monitor-nrpe:${{ github.event.inputs.image_tag }}
58+
tags: ${{ secrets.HARBOR_IP }}/cads/cads-monitor-nrpe:${{ github.event.inputs.image_tag }}
6759
file: Dockerfile

.github/workflows/build-monitor-statistics.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ jobs:
1616
- name: Set up QEMU
1717
uses: docker/setup-qemu-action@v2
1818

19-
- name: Setup harbor ca certificate from secret
20-
run: |
21-
ls /etc/docker
22-
sudo mkdir -p /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"
23-
echo "${{ secrets.HARBOR_CERT }}" | sudo tee /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt >/dev/null
24-
- name: Copy ca cert
25-
run: |
26-
sudo cp /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt /etc/ssl/certs/ca-certificates.crt
2719
- name: Login to harbor registry
2820
uses: docker/login-action@v2
2921
with:
@@ -63,5 +55,5 @@ jobs:
6355
with:
6456
context: .
6557
push: true
66-
tags: ${{ secrets.HARBOR_IP }}/cads-dev-env/cads-monitor-statistics:${{ github.event.inputs.image_tag }}
58+
tags: ${{ secrets.HARBOR_IP }}/cads/cads-monitor-statistics:${{ github.event.inputs.image_tag }}
6759
file: Dockerfile

.github/workflows/build-monitor-user-details.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ jobs:
1616
- name: Set up QEMU
1717
uses: docker/setup-qemu-action@v2
1818

19-
- name: Setup harbor ca certificate from secret
20-
run: |
21-
ls /etc/docker
22-
sudo mkdir -p /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"
23-
echo "${{ secrets.HARBOR_CERT }}" | sudo tee /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt >/dev/null
24-
- name: Copy ca cert
25-
run: |
26-
sudo cp /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt /etc/ssl/certs/ca-certificates.crt
2719
- name: Login to harbor registry
2820
uses: docker/login-action@v2
2921
with:
@@ -63,5 +55,5 @@ jobs:
6355
with:
6456
context: .
6557
push: true
66-
tags: ${{ secrets.HARBOR_IP }}/cads-dev-env/cads-monitor-user-details:${{ github.event.inputs.image_tag }}
58+
tags: ${{ secrets.HARBOR_IP }}/cads/cads-monitor-user-details:${{ github.event.inputs.image_tag }}
6759
file: Dockerfile

.github/workflows/build-obs-manager.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@ jobs:
2323
- name: Set up QEMU
2424
uses: docker/setup-qemu-action@v2
2525

26-
- name: Setup harbor ca certificate from secret
27-
run: |
28-
ls /etc/docker
29-
sudo mkdir -p /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"
30-
echo "${{ secrets.HARBOR_CERT }}" | sudo tee /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt >/dev/null
31-
- name: Copy ca cert
32-
run: |
33-
sudo cp /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt /etc/ssl/certs/ca-certificates.crt
3426
- name: Login to harbor registry
3527
uses: docker/login-action@v2
3628
with:
@@ -71,5 +63,5 @@ jobs:
7163
with:
7264
context: cads-obs-catalogue-manager
7365
push: true
74-
tags: ${{ secrets.HARBOR_IP }}/cads-dev-env/cads-obs-catalogue-manager:latest
66+
tags: ${{ secrets.HARBOR_IP }}/cads/cads-obs-catalogue-manager:latest
7567
file: cads-obs-catalogue-manager/docker/Dockerfile

.github/workflows/build-profiles-api.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@ jobs:
2424
- name: Set up QEMU
2525
uses: docker/setup-qemu-action@v2
2626

27-
- name: Setup harbor ca certificate from secret
28-
run: |
29-
ls /etc/docker
30-
sudo mkdir -p /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"
31-
echo "${{ secrets.HARBOR_CERT }}" | sudo tee /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt >/dev/null
32-
- name: Copy ca cert
33-
run: |
34-
sudo cp /etc/docker/certs.d/"${{ secrets.HARBOR_IP }}"/ca.crt /etc/ssl/certs/ca-certificates.crt
3527
- name: Login to harbor registry
3628
uses: docker/login-action@v2
3729
with:
@@ -92,5 +84,5 @@ jobs:
9284
with:
9385
context: docker
9486
push: true
95-
tags: ${{ secrets.HARBOR_IP }}/cads-dev-env/profiles-api:${{ github.event.inputs.image_tag }}
87+
tags: ${{ secrets.HARBOR_IP }}/cads/profiles-api:${{ github.event.inputs.image_tag }}
9688
file: docker/profiles-api/Dockerfile

0 commit comments

Comments
 (0)