Skip to content

Commit 4f51fb4

Browse files
matusdrobuliak66matusdrobuliak66
authored
♻️ adjust container labels to new standard (#4761)
1 parent 199e6fa commit 4f51fb4

File tree

2 files changed

+43
-49
lines changed

2 files changed

+43
-49
lines changed

‎services/director-v2/src/simcore_service_director_v2/core/settings.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,6 @@
6464
SERVICE_REVERSE_PROXY_SETTINGS: str = "simcore.service.reverse-proxy-settings"
6565
SERVICE_RUNTIME_BOOTSETTINGS: str = "simcore.service.bootsettings"
6666

67-
ORG_LABELS_TO_SCHEMA_LABELS: dict[str, str] = {
68-
"org.label-schema.build-date": "build_date",
69-
"org.label-schema.vcs-ref": "vcs_ref",
70-
"org.label-schema.vcs-url": "vcs_url",
71-
}
72-
7367
SUPPORTED_TRAEFIK_LOG_LEVELS: set[str] = {"info", "debug", "warn", "error"}
7468

7569

‎services/docker-compose-build.yml‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ services:
4242
target: ${BUILD_TARGET:?build_target_required}
4343
labels:
4444
org.label-schema.schema-version: "1.0"
45-
org.label-schema.build-date: "${BUILD_DATE}"
46-
org.label-schema.vcs-url: "${VCS_URL}"
47-
org.label-schema.vcs-ref: "${VCS_REF}"
45+
org.opencontainers.image.created: "${BUILD_DATE}"
46+
org.opencontainers.image.source: "${VCS_URL}"
47+
org.opencontainers.image.revision: "${VCS_REF}"
4848
io.osparc.api-version: "${API_SERVER_API_VERSION}"
4949

5050
autoscaling:
@@ -60,9 +60,9 @@ services:
6060
target: ${BUILD_TARGET:?build_target_required}
6161
labels:
6262
org.label-schema.schema-version: "1.0"
63-
org.label-schema.build-date: "${BUILD_DATE}"
64-
org.label-schema.vcs-url: "${VCS_URL}"
65-
org.label-schema.vcs-ref: "${VCS_REF}"
63+
org.opencontainers.image.created: "${BUILD_DATE}"
64+
org.opencontainers.image.source: "${VCS_URL}"
65+
org.opencontainers.image.revision: "${VCS_REF}"
6666
io.osparc.api-version: "${AUTOSCALING_API_VERSION}"
6767

6868
catalog:
@@ -78,9 +78,9 @@ services:
7878
target: ${BUILD_TARGET:?build_target_required}
7979
labels:
8080
org.label-schema.schema-version: "1.0"
81-
org.label-schema.build-date: "${BUILD_DATE}"
82-
org.label-schema.vcs-url: "${VCS_URL}"
83-
org.label-schema.vcs-ref: "${VCS_REF}"
81+
org.opencontainers.image.created: "${BUILD_DATE}"
82+
org.opencontainers.image.source: "${VCS_URL}"
83+
org.opencontainers.image.revision: "${VCS_REF}"
8484
io.osparc.api-version: "${CATALOG_API_VERSION}"
8585

8686
clusters-keeper:
@@ -112,9 +112,9 @@ services:
112112
target: ${BUILD_TARGET:?build_target_required}
113113
labels:
114114
org.label-schema.schema-version: "1.0"
115-
org.label-schema.build-date: "${BUILD_DATE}"
116-
org.label-schema.vcs-url: "${VCS_URL}"
117-
org.label-schema.vcs-ref: "${VCS_REF}"
115+
org.opencontainers.image.created: "${BUILD_DATE}"
116+
org.opencontainers.image.source: "${VCS_URL}"
117+
org.opencontainers.image.revision: "${VCS_REF}"
118118
io.osparc.api-version: "${DIRECTOR_API_VERSION}"
119119

120120
dask-sidecar:
@@ -131,9 +131,9 @@ services:
131131
target: ${BUILD_TARGET:?build_target_required}
132132
labels:
133133
org.label-schema.schema-version: "1.0"
134-
org.label-schema.build-date: "${BUILD_DATE}"
135-
org.label-schema.vcs-url: "${VCS_URL}"
136-
org.label-schema.vcs-ref: "${VCS_REF}"
134+
org.opencontainers.image.created: "${BUILD_DATE}"
135+
org.opencontainers.image.source: "${VCS_URL}"
136+
org.opencontainers.image.revision: "${VCS_REF}"
137137

138138
director-v2:
139139
image: local/director-v2:${BUILD_TARGET:?build_target_required}
@@ -148,9 +148,9 @@ services:
148148
target: ${BUILD_TARGET:?build_target_required}
149149
labels:
150150
org.label-schema.schema-version: "1.0"
151-
org.label-schema.build-date: "${BUILD_DATE}"
152-
org.label-schema.vcs-url: "${VCS_URL}"
153-
org.label-schema.vcs-ref: "${VCS_REF}"
151+
org.opencontainers.image.created: "${BUILD_DATE}"
152+
org.opencontainers.image.source: "${VCS_URL}"
153+
org.opencontainers.image.revision: "${VCS_REF}"
154154
io.osparc.api-version: "${DIRECTOR_V2_API_VERSION}"
155155

156156
migration:
@@ -166,9 +166,9 @@ services:
166166
target: production
167167
labels:
168168
org.label-schema.schema-version: "1.0"
169-
org.label-schema.build-date: "${BUILD_DATE}"
170-
org.label-schema.vcs-url: "${VCS_URL}"
171-
org.label-schema.vcs-ref: "${VCS_REF}"
169+
org.opencontainers.image.created: "${BUILD_DATE}"
170+
org.opencontainers.image.source: "${VCS_URL}"
171+
org.opencontainers.image.revision: "${VCS_REF}"
172172

173173
osparc-gateway-server:
174174
image: local/osparc-gateway-server:${BUILD_TARGET:?build_target_required}
@@ -221,9 +221,9 @@ services:
221221
target: ${BUILD_TARGET:?build_target_required}
222222
labels:
223223
org.label-schema.schema-version: "1.0"
224-
org.label-schema.build-date: "${BUILD_DATE}"
225-
org.label-schema.vcs-url: "${VCS_URL}"
226-
org.label-schema.vcs-ref: "${VCS_REF}"
224+
org.opencontainers.image.created: "${BUILD_DATE}"
225+
org.opencontainers.image.source: "${VCS_URL}"
226+
org.opencontainers.image.revision: "${VCS_REF}"
227227

228228
webserver:
229229
image: local/webserver:${BUILD_TARGET:?build_target_required}
@@ -242,9 +242,9 @@ services:
242242
- VCS_REF=${VCS_REF}
243243
labels:
244244
org.label-schema.schema-version: "1.0"
245-
org.label-schema.build-date: "${BUILD_DATE}"
246-
org.label-schema.vcs-url: "${VCS_URL}"
247-
org.label-schema.vcs-ref: "${VCS_REF}"
245+
org.opencontainers.image.created: "${BUILD_DATE}"
246+
org.opencontainers.image.source: "${VCS_URL}"
247+
org.opencontainers.image.revision: "${VCS_REF}"
248248
io.osparc.api-version: "${WEBSERVER_API_VERSION}"
249249

250250
dynamic-sidecar:
@@ -260,9 +260,9 @@ services:
260260
target: ${BUILD_TARGET:?build_target_required}
261261
labels:
262262
org.label-schema.schema-version: "1.0"
263-
org.label-schema.build-date: "${BUILD_DATE}"
264-
org.label-schema.vcs-url: "${VCS_URL}"
265-
org.label-schema.vcs-ref: "${VCS_REF}"
263+
org.opencontainers.image.created: "${BUILD_DATE}"
264+
org.opencontainers.image.source: "${VCS_URL}"
265+
org.opencontainers.image.revision: "${VCS_REF}"
266266

267267
invitations:
268268
image: local/invitations:${BUILD_TARGET:?build_target_required}
@@ -277,9 +277,9 @@ services:
277277
target: ${BUILD_TARGET:?build_target_required}
278278
labels:
279279
org.label-schema.schema-version: "1.0"
280-
org.label-schema.build-date: "${BUILD_DATE}"
281-
org.label-schema.vcs-url: "${VCS_URL}"
282-
org.label-schema.vcs-ref: "${VCS_REF}"
280+
org.opencontainers.image.created: "${BUILD_DATE}"
281+
org.opencontainers.image.source: "${VCS_URL}"
282+
org.opencontainers.image.revision: "${VCS_REF}"
283283
io.osparc.api-version: "${INVITATIONS_API_VERSION}"
284284

285285

@@ -295,10 +295,10 @@ services:
295295
- ${DOCKER_REGISTRY:-itisfoundation}/payments:release-github-latest
296296
target: ${BUILD_TARGET:?build_target_required}
297297
labels:
298-
io.osparc.api-version: "${PAYMENTS_API_VERSION}"
299298
org.opencontainers.image.created: "${BUILD_DATE}"
300299
org.opencontainers.image.source: "${VCS_URL}"
301300
org.opencontainers.image.revision: "${VCS_REF}"
301+
io.osparc.api-version: "${PAYMENTS_API_VERSION}"
302302

303303

304304
datcore-adapter:
@@ -314,9 +314,9 @@ services:
314314
target: ${BUILD_TARGET:?build_target_required}
315315
labels:
316316
org.label-schema.schema-version: "1.0"
317-
org.label-schema.build-date: "${BUILD_DATE}"
318-
org.label-schema.vcs-url: "${VCS_URL}"
319-
org.label-schema.vcs-ref: "${VCS_REF}"
317+
org.opencontainers.image.created: "${BUILD_DATE}"
318+
org.opencontainers.image.source: "${VCS_URL}"
319+
org.opencontainers.image.revision: "${VCS_REF}"
320320
io.osparc.api-version: "${DATCORE_ADAPTER_API_VERSION}"
321321

322322
storage:
@@ -332,9 +332,9 @@ services:
332332
target: ${BUILD_TARGET:?build_target_required}
333333
labels:
334334
org.label-schema.schema-version: "1.0"
335-
org.label-schema.build-date: "${BUILD_DATE}"
336-
org.label-schema.vcs-url: "${VCS_URL}"
337-
org.label-schema.vcs-ref: "${VCS_REF}"
335+
org.opencontainers.image.created: "${BUILD_DATE}"
336+
org.opencontainers.image.source: "${VCS_URL}"
337+
org.opencontainers.image.revision: "${VCS_REF}"
338338
io.osparc.api-version: "${STORAGE_API_VERSION}"
339339

340340
agent:
@@ -356,7 +356,7 @@ services:
356356
target: ${BUILD_TARGET:?build_target_required}
357357
labels:
358358
org.label-schema.schema-version: "1.0"
359-
org.label-schema.build-date: "${BUILD_DATE}"
360-
org.label-schema.vcs-url: "${VCS_URL}"
361-
org.label-schema.vcs-ref: "${VCS_REF}"
359+
org.opencontainers.image.created: "${BUILD_DATE}"
360+
org.opencontainers.image.source: "${VCS_URL}"
361+
org.opencontainers.image.revision: "${VCS_REF}"
362362
io.osparc.api-version: "${AGENT_API_VERSION}"

0 commit comments

Comments
 (0)