Skip to content

Commit 14bcd1d

Browse files
committed
Update image tags to new naming structure
1 parent ef57072 commit 14bcd1d

6 files changed

Lines changed: 51 additions & 9 deletions

File tree

.gitlab-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
stages:
2+
- prepare
23
- container
34
- container:boot
45

.gitlab/ci/container-boot.gitlab-ci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
extends:
1919
- .container:boot
2020
needs:
21+
- generate-environment
2122
- manifest:sagittarius
2223
parallel:
2324
matrix:
@@ -57,6 +58,7 @@ container:boot:aquila:
5758
extends:
5859
- .container:boot
5960
needs:
61+
- generate-environment
6062
- manifest:aquila
6163
- manifest:sagittarius
6264
variables:
@@ -80,6 +82,7 @@ container:boot:taurus:
8082
extends:
8183
- .container:boot
8284
needs:
85+
- generate-environment
8386
- manifest:taurus
8487
script:
8588
- bundle install
@@ -93,6 +96,7 @@ container:boot:draco:
9396
extends:
9497
- .container:boot
9598
needs:
99+
- generate-environment
96100
- manifest:draco
97101
parallel:
98102
matrix:
@@ -114,6 +118,7 @@ container:boot:sculptor:
114118
extends:
115119
- .container:boot
116120
needs:
121+
- generate-environment
117122
- manifest:sculptor
118123
parallel:
119124
matrix:

.gitlab/ci/container-build.gitlab-ci.yml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
- >
3434
build_image
3535
$image
36-
$CI_PIPELINE_ID
36+
$RETICULUM_CONTAINER_VERSION
3737
"
3838
--output type=registry,push-by-digest=true
3939
--metadata-file manifest-${CI_JOB_ID}.json
@@ -62,7 +62,7 @@
6262
- >
6363
build_image
6464
$image
65-
$CI_PIPELINE_ID
65+
$RETICULUM_CONTAINER_VERSION
6666
"
6767
--build-arg VARIANT=$VARIANT
6868
--output type=registry,push-by-digest=true
@@ -86,34 +86,40 @@
8686
variables:
8787
PLATFORM: amd64
8888
script:
89-
- create_manifest $image $(get_image_tag $CI_PIPELINE_ID $VARIANT)
89+
- create_manifest $image $(get_image_tag $RETICULUM_CONTAINER_VERSION $VARIANT)
9090

9191
container:mise:
9292
extends:
9393
- .single-image-build-base
94+
needs:
95+
- generate-environment
9496

9597
manifest:mise:
9698
extends:
9799
- .manifest-create-base
98100
needs:
101+
- generate-environment
99102
- container:mise
100103

101104
container:rust:
102105
extends:
103106
- .single-image-build-base
104107
needs:
108+
- generate-environment
105109
- manifest:mise
106110

107111
manifest:rust:
108112
extends:
109113
- .manifest-create-base
110114
needs:
115+
- generate-environment
111116
- container:rust
112117

113118
container:aquila:
114119
extends:
115120
- .single-image-build-base
116121
needs:
122+
- generate-environment
117123
- manifest:rust
118124
variables:
119125
NEED_PROJECT_DOWNLOAD: 'true'
@@ -122,12 +128,14 @@ manifest:aquila:
122128
extends:
123129
- .manifest-create-base
124130
needs:
131+
- generate-environment
125132
- container:aquila
126133

127134
container:draco:
128135
extends:
129136
- .variant-image-build-base
130137
needs:
138+
- generate-environment
131139
- manifest:rust
132140
variables:
133141
NEED_PROJECT_DOWNLOAD: 'true'
@@ -149,6 +157,7 @@ manifest:draco:
149157
- rest
150158
- cron
151159
needs:
160+
- generate-environment
152161
- job: container:draco
153162
parallel:
154163
matrix:
@@ -161,6 +170,7 @@ container:taurus:
161170
extends:
162171
- .single-image-build-base
163172
needs:
173+
- generate-environment
164174
- manifest:rust
165175
variables:
166176
NEED_PROJECT_DOWNLOAD: 'true'
@@ -169,36 +179,42 @@ manifest:taurus:
169179
extends:
170180
- .manifest-create-base
171181
needs:
182+
- generate-environment
172183
- container:taurus
173184

174185
container:ruby:
175186
extends:
176187
- .single-image-build-base
177188
needs:
189+
- generate-environment
178190
- manifest:mise
179191

180192
manifest:ruby:
181193
extends:
182194
- .manifest-create-base
183195
needs:
196+
- generate-environment
184197
- container:ruby
185198

186199
container:postgresql:
187200
extends:
188201
- .single-image-build-base
189202
needs:
203+
- generate-environment
190204
- manifest:mise
191205

192206
manifest:postgresql:
193207
extends:
194208
- .manifest-create-base
195209
needs:
210+
- generate-environment
196211
- container:postgresql
197212

198213
container:sagittarius:
199214
extends:
200215
- .variant-image-build-base
201216
needs:
217+
- generate-environment
202218
- manifest:ruby
203219
- manifest:postgresql
204220
variables:
@@ -221,6 +237,7 @@ manifest:sagittarius:
221237
- ce
222238
- ee
223239
needs:
240+
- generate-environment
224241
- job: container:sagittarius
225242
parallel:
226243
matrix:
@@ -233,18 +250,21 @@ container:node:
233250
extends:
234251
- .single-image-build-base
235252
needs:
253+
- generate-environment
236254
- manifest:mise
237255

238256
manifest:node:
239257
extends:
240258
- .manifest-create-base
241259
needs:
260+
- generate-environment
242261
- container:node
243262

244263
container:sculptor:
245264
extends:
246265
- .variant-image-build-base
247266
needs:
267+
- generate-environment
248268
- manifest:node
249269
variables:
250270
NEED_PROJECT_DOWNLOAD: 'true'
@@ -268,6 +288,7 @@ manifest:sculptor:
268288
- ee
269289
- cloud
270290
needs:
291+
- generate-environment
271292
- job: container:sculptor
272293
parallel:
273294
matrix:

.gitlab/ci/prepare.gitlab-ci.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
generate-environment:
2+
stage: prepare
3+
image: alpine:3.22
4+
script:
5+
- echo "RETICULUM_CONTAINER_VERSION=$(cat VERSION)-experimental-$CI_PIPELINE_ID-$CI_COMMIT_SHA" > .gitlab/ci/env
6+
- echo -e "\e[0Ksection_start:`date +%s`:glpa_summary\r\e[0KHeader of the summary"
7+
- grep 'RETICULUM_CONTAINER_VERSION=' .gitlab/ci/env
8+
- echo -e "\e[0Ksection_end:`date +%s`:glpa_summary\r\e[0K"
9+
artifacts:
10+
expire_in: 1 day
11+
reports:
12+
dotenv: .gitlab/ci/env
13+
paths:
14+
- .gitlab/ci/env

VERSION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0.0.0

support/docker-compose.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
POSTGRES_DB: sagittarius_production
1010

1111
sagittarius-rails-web:
12-
image: ghcr.io/code0-tech/reticulum/ci-builds/sagittarius:${CI_PIPELINE_ID}-${SAGITTARIUS_VARIANT}
12+
image: ghcr.io/code0-tech/reticulum/ci-builds/sagittarius:${RETICULUM_CONTAINER_VERSION}-${SAGITTARIUS_VARIANT}
1313
networks:
1414
- boot
1515
volumes:
@@ -31,7 +31,7 @@ services:
3131
- http://sagittarius-rails-web:3000/health/liveness
3232

3333
sagittarius-grpc:
34-
image: ghcr.io/code0-tech/reticulum/ci-builds/sagittarius:${CI_PIPELINE_ID}-${SAGITTARIUS_VARIANT}
34+
image: ghcr.io/code0-tech/reticulum/ci-builds/sagittarius:${RETICULUM_CONTAINER_VERSION}-${SAGITTARIUS_VARIANT}
3535
networks:
3636
- boot
3737
volumes:
@@ -51,7 +51,7 @@ services:
5151
- -js
5252

5353
aquila:
54-
image: ghcr.io/code0-tech/reticulum/ci-builds/aquila:${CI_PIPELINE_ID}
54+
image: ghcr.io/code0-tech/reticulum/ci-builds/aquila:${RETICULUM_CONTAINER_VERSION}
5555
networks:
5656
- boot
5757
environment:
@@ -65,7 +65,7 @@ services:
6565
- "8081:8081"
6666

6767
taurus:
68-
image: ghcr.io/code0-tech/reticulum/ci-builds/taurus:${CI_PIPELINE_ID}
68+
image: ghcr.io/code0-tech/reticulum/ci-builds/taurus:${RETICULUM_CONTAINER_VERSION}
6969
networks:
7070
- boot
7171
environment:
@@ -77,7 +77,7 @@ services:
7777
- "8082:8082"
7878

7979
draco:
80-
image: ghcr.io/code0-tech/reticulum/ci-builds/draco:${CI_PIPELINE_ID}-${DRACO_VARIANT}
80+
image: ghcr.io/code0-tech/reticulum/ci-builds/draco:${RETICULUM_CONTAINER_VERSION}-${DRACO_VARIANT}
8181
networks:
8282
- boot
8383
environment:
@@ -89,7 +89,7 @@ services:
8989
- "8083:8083"
9090

9191
sculptor:
92-
image: ghcr.io/code0-tech/reticulum/ci-builds/sculptor:${CI_PIPELINE_ID}-${SCULPTOR_VARIANT}
92+
image: ghcr.io/code0-tech/reticulum/ci-builds/sculptor:${RETICULUM_CONTAINER_VERSION}-${SCULPTOR_VARIANT}
9393
networks:
9494
- boot
9595

0 commit comments

Comments
 (0)