Skip to content

Commit a54aa6f

Browse files
ducheneanduchenean
committed
Merge branch 'master' into del-docker-cron-instance
2 parents 685f71a + 7772726 commit a54aa6f

File tree

10 files changed

+209
-148
lines changed

10 files changed

+209
-148
lines changed

‎.github/workflows/docker-hub-publish-base.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎.github/workflows/docker-hub-publish.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎.github/workflows/docker-publish-base.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Update base image
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
- cron: '0 2 * * *' # Daily at 02:00
6+
7+
jobs:
8+
base:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Build and publish base image to harbor
12+
uses: IMIO/buildout.pm/actions/harbor@master
13+
with:
14+
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
15+
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
16+
HARBOR_URL: ${{ secrets.HARBOR_URL }}
17+
DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
18+
DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
19+
tags: |
20+
imiobe/iadelib:base
21+
"${{ secrets.HARBOR_URL }}/delib/iadelib:base"
22+
dockerfile: ./docker/Dockerfile-base

‎.github/workflows/docker-publish.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Update images
2+
on:
3+
workflow_dispatch:
4+
push:
5+
branches: [ master ]
6+
jobs:
7+
docker:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Build latest
11+
uses: IMIO/buildout.pm/actions/harbor@master
12+
with:
13+
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
14+
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
15+
HARBOR_URL: ${{ secrets.HARBOR_URL }}
16+
DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
17+
DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
18+
tags: |
19+
imiobe/iadelib:latest
20+
"${{ secrets.HARBOR_URL }}/delib/iadelib:latest"
21+
dockerfile: ./docker/Dockerfile-latest
22+
- name: Build and publish dev image
23+
uses: IMIO/buildout.pm/actions/harbor@master
24+
with:
25+
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
26+
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
27+
HARBOR_URL: ${{ secrets.HARBOR_URL }}
28+
DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
29+
DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
30+
tags: imiobe/iadelib:dev
31+
dockerfile: ./docker/Dockerfile-dev
32+
profile: communes-dev

‎.github/workflows/release.yml

Lines changed: 91 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -8,131 +8,160 @@ jobs:
88
communes:
99
runs-on: ubuntu-latest
1010
steps:
11-
- name: Checkout
12-
uses: actions/checkout@v2
13-
- name: Build and publish to dockerhub
14-
uses: IMIO/buildout.pm/actions/dockerhub@master
11+
- name: Build and publish communes image to harbor
12+
uses: IMIO/buildout.pm/actions/harbor@master
1513
with:
1614
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
1715
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
18-
tags: "imiobe/iadelib:${{ github.ref_name }},imiobe/iadelib:communes-${{ github.ref_name }}"
16+
HARBOR_URL: ${{ secrets.HARBOR_URL }}
17+
DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
18+
DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
19+
tags: |
20+
"imiobe/iadelib:${{ github.ref_name }}"
21+
"imiobe/iadelib:communes-${{ github.ref_name }}"
22+
"${{ secrets.HARBOR_URL }}/delib/iadelib:${{ github.ref_name }}"
23+
"${{ secrets.HARBOR_URL }}/delib/iadelib:${{ github.ref_name }}"
24+
1925
bep:
2026
runs-on: ubuntu-latest
2127
steps:
22-
- name: Checkout
23-
uses: actions/checkout@v2
24-
- name: Build and publish to dockerhub
25-
uses: IMIO/buildout.pm/actions/dockerhub@master
28+
- name: Build and publish bep image to harbor
29+
uses: IMIO/buildout.pm/actions/harbor@master
2630
with:
2731
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
2832
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
33+
HARBOR_URL: ${{ secrets.HARBOR_URL }}
34+
DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
35+
DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
2936
profile: bep
30-
tags: "imiobe/iadelib:bep-${{ github.ref_name }}"
37+
tags: |
38+
"imiobe/iadelib:bep-${{ github.ref_name }}"
39+
"${{ secrets.HARBOR_URL }}/delib/iadelib:bep-${{ github.ref_name }}"
40+
3141
charleroi:
3242
runs-on: ubuntu-latest
3343
steps:
34-
- name: Checkout
35-
uses: actions/checkout@v2
36-
- name: Build and publish to dockerhub
37-
uses: IMIO/buildout.pm/actions/dockerhub@master
44+
- name: Build and publish charleroi image to harbor
45+
uses: IMIO/buildout.pm/actions/harbor@master
3846
with:
3947
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
4048
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
49+
HARBOR_URL: ${{ secrets.HARBOR_URL }}
50+
DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
51+
DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
4152
profile: charleroi
42-
tags: "imiobe/iadelib:charleroi-${{ github.ref_name }}"
53+
tags: |
54+
"imiobe/iadelib:charleroi-${{ github.ref_name }}"
55+
"${{ secrets.HARBOR_URL }}/delib/iadelib:charleroi-${{ github.ref_name }}"
56+
4357
hainaut-prov:
4458
runs-on: ubuntu-latest
4559
steps:
46-
- name: Checkout
47-
uses: actions/checkout@v2
48-
- name: Build and publish to dockerhub
49-
uses: IMIO/buildout.pm/actions/dockerhub@master
60+
- name: Build and publish hainaut-prov image to harbor
61+
uses: IMIO/buildout.pm/actions/harbor@master
5062
with:
5163
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
5264
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
65+
HARBOR_URL: ${{ secrets.HARBOR_URL }}
66+
DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
67+
DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
5368
profile: hainaut-prov
54-
tags: "imiobe/iadelib:hainaut-prov-${{ github.ref_name }}"
55-
# idea:
56-
# runs-on: ubuntu-latest
57-
# steps:
58-
# - name: Checkout
59-
# uses: actions/checkout@v2
60-
# - name: Build and publish to dockerhub
61-
# uses: IMIO/buildout.pm/actions/dockerhub@master
62-
# with:
63-
# DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
64-
# DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
65-
# profile: idea
66-
# tags: "imiobe/iadelib:idea-${{ github.ref_name }}"
69+
tags: |
70+
"imiobe/iadelib:hainaut-prov-${{ github.ref_name }}"
71+
"${{ secrets.HARBOR_URL }}/delib/iadelib:hainaut-prov-${{ github.ref_name }}"
72+
6773
lalouviere:
6874
runs-on: ubuntu-latest
6975
steps:
70-
- name: Checkout
71-
uses: actions/checkout@v2
72-
- name: Build and publish to dockerhub
73-
uses: IMIO/buildout.pm/actions/dockerhub@master
76+
- name: Build and publish lalouviere image to harbor
77+
uses: IMIO/buildout.pm/actions/harbor@master
7478
with:
7579
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
7680
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
81+
HARBOR_URL: ${{ secrets.HARBOR_URL }}
82+
DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
83+
DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
7784
profile: lalouviere
78-
tags: "imiobe/iadelib:lalouviere-${{ github.ref_name }}"
85+
tags: |
86+
"imiobe/iadelib:lalouviere-${{ github.ref_name }}"
87+
"${{ secrets.HARBOR_URL }}/delib/iadelib:lalouviere-${{ github.ref_name }}"
88+
7989
lalouviere-cpas:
8090
runs-on: ubuntu-latest
8191
steps:
82-
- name: Checkout
83-
uses: actions/checkout@v2
84-
- name: Build and publish to dockerhub
85-
uses: IMIO/buildout.pm/actions/dockerhub@master
92+
- name: Build and publish lalouviere-cpas image to harbor
93+
uses: IMIO/buildout.pm/actions/harbor@master
8694
with:
8795
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
8896
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
97+
HARBOR_URL: ${{ secrets.HARBOR_URL }}
98+
DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
99+
DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
89100
profile: lalouviere-cpas
90-
tags: "imiobe/iadelib:lalouviere-cpas-${{ github.ref_name }}"
101+
tags: |
102+
"imiobe/iadelib:lalouviere-cpas-${{ github.ref_name }}"
103+
"${{ secrets.HARBOR_URL }}/delib/iadelib:lalouviere-cpas-${{ github.ref_name }}"
104+
91105
liege:
92106
runs-on: ubuntu-latest
93107
steps:
94-
- name: Checkout
95-
uses: actions/checkout@v2
96-
- name: Build and publish to dockerhub
97-
uses: IMIO/buildout.pm/actions/dockerhub@master
108+
- name: Build and publish liege image to harbor
109+
uses: IMIO/buildout.pm/actions/harbor@master
98110
with:
99111
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
100112
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
113+
HARBOR_URL: ${{ secrets.HARBOR_URL }}
114+
DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
115+
DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
101116
profile: liege
102-
tags: "imiobe/iadelib:liege-${{ github.ref_name }}"
117+
tags: |
118+
"imiobe/iadelib:liege-${{ github.ref_name }}"
119+
"${{ secrets.HARBOR_URL }}/delib/iadelib:liege-${{ github.ref_name }}"
120+
103121
mons:
104122
runs-on: ubuntu-latest
105123
steps:
106-
- name: Checkout
107-
uses: actions/checkout@v2
108-
- name: Build and publish to dockerhub
109-
uses: IMIO/buildout.pm/actions/dockerhub@master
124+
- name: Build and publish mons image to harbor
125+
uses: IMIO/buildout.pm/actions/harbor@master
110126
with:
111127
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
112128
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
129+
HARBOR_URL: ${{ secrets.HARBOR_URL }}
130+
DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
131+
DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
113132
profile: mons
114-
tags: "imiobe/iadelib:mons-${{ github.ref_name }}"
133+
tags: |
134+
"imiobe/iadelib:mons-${{ github.ref_name }}"
135+
"${{ secrets.HARBOR_URL }}/delib/iadelib:mons-${{ github.ref_name }}"
136+
115137
namur:
116138
runs-on: ubuntu-latest
117139
steps:
118-
- name: Checkout
119-
uses: actions/checkout@v2
120-
- name: Build and publish to dockerhub
121-
uses: IMIO/buildout.pm/actions/dockerhub@master
140+
- name: Build and publish namur image to harbor
141+
uses: IMIO/buildout.pm/actions/harbor@master
122142
with:
123143
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
124144
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
145+
HARBOR_URL: ${{ secrets.HARBOR_URL }}
146+
DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
147+
DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
125148
profile: namur
126-
tags: "imiobe/iadelib:namur-${{ github.ref_name }}"
149+
tags: |
150+
"imiobe/iadelib:namur-${{ github.ref_name }}"
151+
"${{ secrets.HARBOR_URL }}/delib/iadelib:namur-${{ github.ref_name }}"
152+
127153
seraing:
128154
runs-on: ubuntu-latest
129155
steps:
130-
- name: Checkout
131-
uses: actions/checkout@v2
132-
- name: Build and publish to dockerhub
133-
uses: IMIO/buildout.pm/actions/dockerhub@master
156+
- name: Build and publish seraing image to harbor
157+
uses: IMIO/buildout.pm/actions/harbor@master
134158
with:
135159
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
136160
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
161+
HARBOR_URL: ${{ secrets.HARBOR_URL }}
162+
DELIB_HARBOR_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
163+
DELIB_HARBOR_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}
137164
profile: seraing
138-
tags: "imiobe/iadelib:seraing-${{ github.ref_name }}"
165+
tags: |
166+
"imiobe/iadelib:seraing-${{ github.ref_name }}"
167+
"${{ secrets.HARBOR_URL }}/delib/iadelib:seraing-${{ github.ref_name }}"

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ share
2525
config/core.properties
2626
local
2727
docker/data
28+
docker/extensions
2829
.plone.versioncheck.cache/
2930
.plone.versioncheck.tracked.json
3031
checkversion.html

‎actions/dockerhub/action.yml

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)