Skip to content

Commit 22eb547

Browse files
committed
start using images from platform.sunet.se
1 parent ce684d8 commit 22eb547

File tree

2 files changed

+33
-33
lines changed

2 files changed

+33
-33
lines changed

bin/run_with_admintools

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ docker run --rm ${DOCKER_RUN_OPTIONS} \
3434
-v ${PWD}/mongodb/db-scripts:/opt/eduid/mongodb/db-scripts:ro \
3535
-v ${PWD}/raw_db_changes:/root/raw_db_changes \
3636
${SOURCES} \
37-
docker.sunet.se/eduid/admintools:staging \
37+
platform.sunet.se/eduid/admintools:staging \
3838
$*

eduid/compose.yml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212

1313
# This is a one-off job that deletes old logs on startup (preserving permissions etc. on the log files).
1414
log_cleanup:
15-
image: 'platform.sunet.se/eduid/worker:20260320T113739-staging'
15+
image: platform.sunet.se/eduid/worker:20260320T113739-staging
1616
volumes:
1717
- eduidlogdata:/var/log/eduid
1818
- mongodblogdata:/var/log/mongodb
@@ -114,7 +114,7 @@ services:
114114

115115
auth_server:
116116
image: docker.sunet.se/sunet/sunet-auth-server:latest
117-
pull_policy: if_not_present
117+
pull_policy: weekly
118118
restart: always
119119
networks:
120120
dev:
@@ -144,8 +144,8 @@ services:
144144
condition: service_healthy
145145

146146
api_haproxy:
147-
image: 'docker.sunet.se/eduid/haproxy:latest'
148-
pull_policy: if_not_present
147+
image: platform.sunet.se/eduid/haproxy:latest
148+
pull_policy: weekly
149149
restart: always
150150
networks:
151151
dev:
@@ -200,8 +200,8 @@ services:
200200
condition: service_started
201201

202202
bankid_haproxy:
203-
image: 'docker.sunet.se/eduid/haproxy:latest'
204-
pull_policy: if_not_present
203+
image: platform.sunet.se/eduid/haproxy:latest
204+
pull_policy: weekly
205205
restart: always
206206
networks:
207207
dev:
@@ -219,8 +219,8 @@ services:
219219
condition: service_started
220220

221221
dashboard_haproxy:
222-
image: 'docker.sunet.se/eduid/haproxy:latest'
223-
pull_policy: if_not_present
222+
image: platform.sunet.se/eduid/haproxy:latest
223+
pull_policy: weekly
224224
restart: always
225225
networks:
226226
dev:
@@ -315,8 +315,8 @@ services:
315315
condition: service_started
316316

317317
eidas_haproxy:
318-
image: 'docker.sunet.se/eduid/haproxy:latest'
319-
pull_policy: if_not_present
318+
image: platform.sunet.se/eduid/haproxy:latest
319+
pull_policy: weekly
320320
restart: always
321321
networks:
322322
dev:
@@ -387,8 +387,8 @@ services:
387387
<<: *common-depends-on
388388

389389
html_haproxy:
390-
image: 'docker.sunet.se/eduid/haproxy:latest'
391-
pull_policy: if_not_present
390+
image: platform.sunet.se/eduid/haproxy:latest
391+
pull_policy: weekly
392392
restart: always
393393
networks:
394394
dev:
@@ -406,8 +406,8 @@ services:
406406
condition: service_healthy
407407

408408
managed_accounts_haproxy:
409-
image: 'docker.sunet.se/eduid/haproxy:latest'
410-
pull_policy: if_not_present
409+
image: platform.sunet.se/eduid/haproxy:latest
410+
pull_policy: weekly
411411
restart: always
412412
networks:
413413
dev:
@@ -462,8 +462,8 @@ services:
462462
condition: service_started
463463

464464
idp_haproxy:
465-
image: 'docker.sunet.se/eduid/haproxy:latest'
466-
pull_policy: if_not_present
465+
image: platform.sunet.se/eduid/haproxy:latest
466+
pull_policy: weekly
467467
restart: always
468468
networks:
469469
dev:
@@ -514,8 +514,8 @@ services:
514514
condition: service_started
515515

516516
idpproxy_haproxy:
517-
image: 'docker.sunet.se/eduid/haproxy:latest'
518-
pull_policy: if_not_present
517+
image: platform.sunet.se/eduid/haproxy:latest
518+
pull_policy: weekly
519519
restart: always
520520
networks:
521521
dev:
@@ -657,8 +657,8 @@ services:
657657
condition: service_started
658658

659659
mongodb:
660-
image: docker.sunet.se/eduid/mongodb
661-
pull_policy: if_not_present
660+
image: platform.sunet.se/eduid/mongodb:latest
661+
pull_policy: weekly
662662
restart: always
663663
expose:
664664
- 27017
@@ -712,7 +712,7 @@ services:
712712
condition: service_started
713713

714714
navet_service:
715-
image: docker.sunet.se/eduid/eduid-navet-service:staging
715+
image: platform.sunet.se/eduid/eduid-navet-service:staging
716716
pull_policy: if_not_present
717717
restart: always
718718
networks:
@@ -827,8 +827,8 @@ services:
827827
condition: service_started
828828

829829
py11softhsm:
830-
image: docker.sunet.se/eduid/py11softhsm:latest
831-
pull_policy: if_not_present
830+
image: platform.sunet.se/eduid/py11softhsm:latest
831+
pull_policy: weekly
832832
restart: always
833833
networks:
834834
dev:
@@ -933,8 +933,8 @@ services:
933933
condition: service_healthy
934934

935935
redis:
936-
image: docker.sunet.se/eduid/redis
937-
pull_policy: if_not_present
936+
image: platform.sunet.se/eduid/redis:staging
937+
pull_policy: weekly
938938
restart: always
939939
expose:
940940
- 6379
@@ -985,8 +985,8 @@ services:
985985
condition: service_started
986986

987987
rsyslog:
988-
image: docker.sunet.se/eduid/rsyslog
989-
pull_policy: if_not_present
988+
image: platform.sunet.se/eduid/rsyslog:latest
989+
pull_policy: weekly
990990
restart: always
991991
expose:
992992
- 514
@@ -1102,8 +1102,8 @@ services:
11021102
condition: service_started
11031103

11041104
signup_haproxy:
1105-
image: 'docker.sunet.se/eduid/haproxy:latest'
1106-
pull_policy: if_not_present
1105+
image: platform.sunet.se/eduid/haproxy:latest
1106+
pull_policy: weekly
11071107
restart: always
11081108
networks:
11091109
dev:
@@ -1153,8 +1153,8 @@ services:
11531153
condition: service_started
11541154

11551155
support_haproxy:
1156-
image: 'docker.sunet.se/eduid/haproxy:latest'
1157-
pull_policy: if_not_present
1156+
image: platform.sunet.se/eduid/haproxy:latest
1157+
pull_policy: weekly
11581158
restart: always
11591159
networks:
11601160
dev:
@@ -1204,7 +1204,7 @@ services:
12041204
condition: service_started
12051205

12061206
turq:
1207-
image: docker.sunet.se/eduid/turq
1207+
image: platform.sunet.se/eduid/turq
12081208
pull_policy: if_not_present
12091209
restart: always
12101210
networks:

0 commit comments

Comments
 (0)