Skip to content

Commit 3c2ff2b

Browse files
mrnicegyu11mrnicegyu11
committed
Merge branch '2024/makeLocalDeployWorkAgain' into 2024/add/tempo
2 parents 1369e50 + 511dc0f commit 3c2ff2b

File tree

7 files changed

+18
-64
lines changed

7 files changed

+18
-64
lines changed

‎scripts/common.Makefile‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ endif
3535
export DEPLOYMENT_FQDNS_CAPTURE_TRAEFIK_RULE_CATCHALL:=$(shell set -o allexport; \
3636
source $(REPO_CONFIG_LOCATION); \
3737
if [ -z "$${DEPLOYMENT_FQDNS}" ]; then \
38-
DEPLOYMENT_FQDNS_CAPTURE_TRAEFIK_RULE_CATCHALL="(Host(\`$$MACHINE_FQDN\`) && PathPrefix(\`/\`)) || (Host(\`invitations.$$MACHINE_FQDN\`))|| (Host(\`storage.$$MACHINE_FQDN\`)) || (HostRegexp(\`services.$$MACHINE_FQDN\`,\`{subhost:[a-zA-Z0-9-]+}.services.$$MACHINE_FQDN\`) && PathPrefix(\`/\`)) || (HostRegexp(\`services.testing.$$MACHINE_FQDN\`,\`{subhost:[a-zA-Z0-9-]+}.services.testing.$$MACHINE_FQDN\`) && PathPrefix(\`/\`))"; \
38+
DEPLOYMENT_FQDNS_CAPTURE_TRAEFIK_RULE_CATCHALL="(Host(\`$$MACHINE_FQDN\`) && PathPrefix(\`/\`)) || (Host(\`invitations.$$MACHINE_FQDN\`))|| (HostRegexp(\`services.$$MACHINE_FQDN\`,\`{subhost:[a-zA-Z0-9-]+}.services.$$MACHINE_FQDN\`) && PathPrefix(\`/\`)) || (HostRegexp(\`services.testing.$$MACHINE_FQDN\`,\`{subhost:[a-zA-Z0-9-]+}.services.testing.$$MACHINE_FQDN\`) && PathPrefix(\`/\`))"; \
3939
else \
4040
IFS=', ' read -r -a hosts <<< "$${DEPLOYMENT_FQDNS}"; \
41-
DEPLOYMENT_FQDNS_CAPTURE_TRAEFIK_RULE_CATCHALL="(Host(\`$$MACHINE_FQDN\`) && PathPrefix(\`/\`)) || (Host(\`invitations.$$MACHINE_FQDN\`))|| (Host(\`storage.$$MACHINE_FQDN\`)) || (HostRegexp(\`services.$$MACHINE_FQDN\`,\`{subhost:[a-zA-Z0-9-]+}.services.$$MACHINE_FQDN\`) && PathPrefix(\`/\`)) || (HostRegexp(\`services.testing.$$MACHINE_FQDN\`,\`{subhost:[a-zA-Z0-9-]+}.services.testing.$$MACHINE_FQDN\`) && PathPrefix(\`/\`))"; \
41+
DEPLOYMENT_FQDNS_CAPTURE_TRAEFIK_RULE_CATCHALL="(Host(\`$$MACHINE_FQDN\`) && PathPrefix(\`/\`)) || (Host(\`invitations.$$MACHINE_FQDN\`))|| (HostRegexp(\`services.$$MACHINE_FQDN\`,\`{subhost:[a-zA-Z0-9-]+}.services.$$MACHINE_FQDN\`) && PathPrefix(\`/\`)) || (HostRegexp(\`services.testing.$$MACHINE_FQDN\`,\`{subhost:[a-zA-Z0-9-]+}.services.testing.$$MACHINE_FQDN\`) && PathPrefix(\`/\`))"; \
4242
for element in "$${hosts[@]}"; \
4343
do \
44-
DEPLOYMENT_FQDNS_CAPTURE_TRAEFIK_RULE_CATCHALL="$$DEPLOYMENT_FQDNS_CAPTURE_TRAEFIK_RULE_CATCHALL || (Host(\`$$element\`) && PathPrefix(\`/\`)) || (Host(\`invitations.$$element\`)) || (Host(\`storage.$$element\`)) || (HostRegexp(\`services.$$element\`,\`{subhost:[a-zA-Z0-9-]+}.services.$$element\`) && PathPrefix(\`/\`)) || (HostRegexp(\`services.testing.$$element\`,\`{subhost:[a-zA-Z0-9-]+}.services.testing.$$element\`) && PathPrefix(\`/\`))";\
44+
DEPLOYMENT_FQDNS_CAPTURE_TRAEFIK_RULE_CATCHALL="$$DEPLOYMENT_FQDNS_CAPTURE_TRAEFIK_RULE_CATCHALL || (Host(\`$$element\`) && PathPrefix(\`/\`)) || (Host(\`invitations.$$element\`)) || (HostRegexp(\`services.$$element\`,\`{subhost:[a-zA-Z0-9-]+}.services.$$element\`) && PathPrefix(\`/\`)) || (HostRegexp(\`services.testing.$$element\`,\`{subhost:[a-zA-Z0-9-]+}.services.testing.$$element\`) && PathPrefix(\`/\`))";\
4545
done; \
4646
DEPLOYMENT_FQDNS_CAPTURE_TRAEFIK_RULE_CATCHALL="$$DEPLOYMENT_FQDNS_CAPTURE_TRAEFIK_RULE_CATCHALL"; \
4747
fi; \
@@ -64,21 +64,6 @@ export DEPLOYMENT_FQDNS_CAPTURE_INVITATIONS:=$(shell set -o allexport; \
6464
echo $$DEPLOYMENT_FQDNS_CAPTURE_INVITATIONS; \
6565
set +o allexport; )
6666
67-
export DEPLOYMENT_FQDNS_CAPTURE_STORAGE:=$(shell set -o allexport; \
68-
source $(REPO_CONFIG_LOCATION); \
69-
if [ -z "$${DEPLOYMENT_FQDNS}" ]; then \
70-
DEPLOYMENT_FQDNS_CAPTURE_STORAGE="(Host(\`storage.$$MACHINE_FQDN\`))"; \
71-
else \
72-
IFS=', ' read -r -a hosts <<< "$${DEPLOYMENT_FQDNS}"; \
73-
DEPLOYMENT_FQDNS_CAPTURE_STORAGE="(Host(\`storage.$$MACHINE_FQDN\`))"; \
74-
for element in "$${hosts[@]}"; \
75-
do \
76-
DEPLOYMENT_FQDNS_CAPTURE_STORAGE="$$DEPLOYMENT_FQDNS_CAPTURE_STORAGE || (Host(\`storage.$$element\`))";\
77-
done; \
78-
DEPLOYMENT_FQDNS_CAPTURE_STORAGE="$$DEPLOYMENT_FQDNS_CAPTURE_STORAGE"; \
79-
fi; \
80-
echo $$DEPLOYMENT_FQDNS_CAPTURE_STORAGE; \
81-
set +o allexport; )
8267
8368
export DEPLOYMENT_FQDNS_CAPTURE_TRAEFIK_RULE_MAINTENANCE_PAGE:=$(shell set -o allexport; \
8469
source $(REPO_CONFIG_LOCATION); \
@@ -205,7 +190,6 @@ clean-default: .check_clean ## Cleans all outputs
205190
export DEPLOYMENT_FQDNS_TESTING_CAPTURE_TRAEFIK_RULE='${DEPLOYMENT_FQDNS_TESTING_CAPTURE_TRAEFIK_RULE}'; \
206191
export DEPLOYMENT_API_DOMAIN_TESTING_CAPTURE_TRAEFIK_RULE='${DEPLOYMENT_API_DOMAIN_TESTING_CAPTURE_TRAEFIK_RULE}'; \
207192
export DEPLOYMENT_FQDNS_CAPTURE_INVITATIONS='${DEPLOYMENT_FQDNS_CAPTURE_INVITATIONS}'; \
208-
export DEPLOYMENT_FQDNS_CAPTURE_STORAGE='${DEPLOYMENT_FQDNS_CAPTURE_STORAGE}'; \
209193
export DOLLAR='$$'; \
210194
set +o allexport; \
211195
envsubst < $< > .env

‎scripts/s3-previous-versions/README.md‎

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

‎scripts/s3-previous-versions/launch.bash‎

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

‎scripts/s3-previous-versions/template.env‎

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

‎services/minio/docker-compose.yaml‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.7'
22
services:
33
minio:
4-
image: minio/minio:RELEASE.2023-06-19T19-52-50Z
4+
image: minio/minio:RELEASE.2024-10-29T16-01-48Z
55
init: true
66
hostname: minio
77
volumes:
@@ -15,7 +15,6 @@ services:
1515
environment:
1616
- MINIO_ACCESS_KEY_FILE=minio_access_key
1717
- MINIO_SECRET_KEY_FILE=minio_secret_key
18-
- MINIO_PROMETHEUS_AUTH_TYPE=public
1918
deploy:
2019
restart_policy:
2120
delay: 10s
@@ -25,14 +24,20 @@ services:
2524
- traefik.enable=true
2625
- traefik.docker.network=${PUBLIC_NETWORK}
2726
# direct access without path (necessary for minio client it does not like /path)
28-
- traefik.http.services.minio.loadbalancer.server.port=9000
29-
- traefik.http.services.minio.loadbalancer.healthcheck.path=/minio/health/ready
30-
- traefik.http.routers.minio.rule=Host(`${STORAGE_DOMAIN}`)
31-
- traefik.http.routers.minio.entrypoints=https
32-
- traefik.http.routers.minio.tls=true
33-
- traefik.http.routers.minio.middlewares=ops_gzip@swarm
27+
- traefik.http.services.minio9000.loadbalancer.server.port=9000
28+
- traefik.http.services.minio9000.loadbalancer.healthcheck.path=/minio/health/ready
29+
- traefik.http.routers.minio9000.rule=Host(`${STORAGE_DOMAIN}`)
30+
- traefik.http.routers.minio9000.entrypoints=https
31+
- traefik.http.routers.minio9000.tls=true
32+
- traefik.http.routers.minio9000.service=minio9000
33+
#
34+
- traefik.http.services.minio9001.loadbalancer.server.port=9001
35+
- traefik.http.routers.minio9001.rule=Host(`${MONITORING_DOMAIN}`) && PathPrefix(`/minio`)
36+
- traefik.http.routers.minio9001.entrypoints=https
37+
- traefik.http.routers.minio9001.tls=true
38+
- traefik.http.routers.minio9001.service=minio9001
3439
command: >
35-
server /data
40+
server /data --console-address ":9001"
3641
secrets:
3742
- minio_secret_key
3843
- minio_access_key

‎services/simcore/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,5 @@ ${TEMP_COMPOSE}-master: docker-compose.yml docker-compose.deploy.master.yml dock
7070
echo DEPLOYMENT_FQDNS_TESTING_CAPTURE_TRAEFIK_RULE=\''${DEPLOYMENT_FQDNS_TESTING_CAPTURE_TRAEFIK_RULE}'\' >> .env; \
7171
echo DEPLOYMENT_API_DOMAIN_TESTING_CAPTURE_TRAEFIK_RULE=\''${DEPLOYMENT_API_DOMAIN_TESTING_CAPTURE_TRAEFIK_RULE}'\' >> .env; \
7272
echo DEPLOYMENT_FQDNS_CAPTURE_INVITATIONS=\''${DEPLOYMENT_FQDNS_CAPTURE_INVITATIONS}'\' >> .env; \
73-
echo DEPLOYMENT_FQDNS_CAPTURE_STORAGE=\''${DEPLOYMENT_FQDNS_CAPTURE_STORAGE}'\' >> .env; \
7473
echo DOLLAR=\'$$\' >> .env; \
7574
set +o allexport; \

‎services/traefik/docker-compose.local.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ services:
5252
aliases: # This enables the registry to resolve "registry.osparc.local" etc. to minio, via traefik. Necessary to give the registry access to the S3 bucket.
5353
- "${STORAGE_DOMAIN}"
5454
- "${REGISTRY_DOMAIN}"
55+
- "${MONITORING_DOMAIN}"
5556
deploy:
5657
placement:
5758
constraints: []

0 commit comments

Comments
 (0)