Skip to content

Commit f8ed436

Browse files
author
Andrei Neagu
committed
Merge remote-tracking branch 'upstream/master' into pr-osparc-add-director-v0-client
2 parents a32a9e2 + ee36743 commit f8ed436

File tree

291 files changed

+5458
-3342
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

291 files changed

+5458
-3342
lines changed

‎.env-devel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -348,10 +348,10 @@ SIMCORE_VCS_RELEASE_TAG=latest
348348
STUDIES_ACCESS_ANONYMOUS_ALLOWED=0
349349
STUDIES_DEFAULT_SERVICE_THUMBNAIL=https://via.placeholder.com/170x120.png
350350
TRACING_OPENTELEMETRY_COLLECTOR_BATCH_SIZE=2
351-
TRACING_OPENTELEMETRY_COLLECTOR_PORT=4318
352351
TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT=http://opentelemetry-collector
353-
TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE=100
354352
TRACING_OPENTELEMETRY_COLLECTOR_EXPORTER_ENDPOINT=http://jaeger:4318
353+
TRACING_OPENTELEMETRY_COLLECTOR_PORT=4318
354+
TRACING_OPENTELEMETRY_COLLECTOR_SAMPLING_PERCENTAGE=100
355355
TRAEFIK_SIMCORE_ZONE=internal_simcore_stack
356356
TWILIO_ACCOUNT_SID=DUMMY
357357
TWILIO_AUTH_TOKEN=DUMMY
@@ -365,8 +365,8 @@ WEBSERVER_DEV_FEATURES_ENABLED=0
365365
WEBSERVER_DIAGNOSTICS={}
366366
WEBSERVER_EMAIL={}
367367
WEBSERVER_EXPORTER={}
368-
WEBSERVER_FRONTEND={}
369368
WEBSERVER_FOLDERS=1
369+
WEBSERVER_FRONTEND={}
370370
WEBSERVER_GARBAGE_COLLECTOR=null
371371
WEBSERVER_GROUPS=1
372372
WEBSERVER_GUNICORN_CMD_ARGS=--timeout=180

‎.github/workflows/ci-arm-build.yml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: CI ARM64 Build and Push
2+
3+
on:
4+
push:
5+
branches:
6+
- "master"
7+
tags-ignore:
8+
- "*"
9+
10+
workflow_dispatch:
11+
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress: true
15+
16+
jobs:
17+
build-and-push-arm64:
18+
timeout-minutes: 60 # intentionally long to allow for slow builds
19+
runs-on: ubuntu-latest
20+
strategy:
21+
matrix:
22+
os: [ubuntu-22.04]
23+
python: ["3.11"]
24+
env:
25+
# secrets can be set in settings/secrets on github
26+
DOCKER_REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
27+
steps:
28+
- uses: actions/checkout@v4
29+
- name: setup QEMU
30+
uses: docker/setup-qemu-action@v3
31+
- name: setup docker buildx
32+
id: buildx
33+
uses: docker/setup-buildx-action@v3
34+
with:
35+
driver: docker-container
36+
- name: expose github runtime for buildx
37+
uses: crazy-max/ghaction-github-runtime@v3
38+
- name: show system environs
39+
run: ./ci/helpers/show_system_versions.bash
40+
- name: login to Dockerhub
41+
uses: docker/login-action@v2
42+
with:
43+
username: ${{ secrets.DOCKER_USERNAME }}
44+
password: ${{ secrets.DOCKER_PASSWORD }}
45+
- name: Set deployment variables
46+
run: |
47+
if [ "${GITHUB_REF}" == "refs/heads/master" ]; then
48+
echo "TAG_PREFIX=master-github" >> $GITHUB_ENV
49+
elif [[ "${GITHUB_REF}" == refs/heads/hotfix_v* ]]; then
50+
echo "TAG_PREFIX=hotfix-github" >> $GITHUB_ENV
51+
elif [[ "${GITHUB_REF}" == refs/heads/hotfix_staging_* ]]; then
52+
echo "TAG_PREFIX=hotfix-staging-github" >> $GITHUB_ENV
53+
fi
54+
- name: build & push images for latest tag
55+
run: |
56+
export DOCKER_IMAGE_TAG="$TAG_PREFIX-latest-arm64"
57+
export DOCKER_TARGET_PLATFORMS=linux/arm64
58+
make build push=true

‎.github/workflows/ci-multi-architecture-fusing.yml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: CI Multi-Architecture Fusing
2+
3+
on:
4+
workflow_run:
5+
workflows: ["CI ARM64 Build and Push", "CI"]
6+
types:
7+
- completed
8+
branches:
9+
- "master"
10+
11+
12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress: true
15+
16+
jobs:
17+
multi-architecture-fusing:
18+
if: ${{ github.event.workflow_run.conclusion == 'success' }}
19+
timeout-minutes: 60 # intentionally long to allow for slow builds
20+
runs-on: ubuntu-latest
21+
strategy:
22+
matrix:
23+
os: [ubuntu-22.04]
24+
python: ["3.11"]
25+
env:
26+
# secrets can be set in settings/secrets on github
27+
DOCKER_REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
28+
steps:
29+
- uses: actions/checkout@v4
30+
- name: setup QEMU
31+
uses: docker/setup-qemu-action@v3
32+
- name: setup docker buildx
33+
id: buildx
34+
uses: docker/setup-buildx-action@v3
35+
with:
36+
driver: docker-container
37+
- name: expose github runtime for buildx
38+
uses: crazy-max/ghaction-github-runtime@v3
39+
- name: show system environs
40+
run: ./ci/helpers/show_system_versions.bash
41+
- name: login to Dockerhub
42+
uses: docker/login-action@v2
43+
with:
44+
username: ${{ secrets.DOCKER_USERNAME }}
45+
password: ${{ secrets.DOCKER_PASSWORD }}
46+
- name: Set deployment variables
47+
run: |
48+
if [ "${GITHUB_REF}" == "refs/heads/master" ]; then
49+
echo "TAG_PREFIX=master-github" >> $GITHUB_ENV
50+
elif [[ "${GITHUB_REF}" == refs/heads/hotfix_v* ]]; then
51+
echo "TAG_PREFIX=hotfix-github" >> $GITHUB_ENV
52+
elif [[ "${GITHUB_REF}" == refs/heads/hotfix_staging_* ]]; then
53+
echo "TAG_PREFIX=hotfix-staging-github" >> $GITHUB_ENV
54+
fi
55+
- name: fuse images in the registry for latest tag
56+
run: |
57+
export DOCKER_IMAGE_TAG="$TAG_PREFIX-latest"
58+
make docker-image-fuse SUFFIX=arm64

0 commit comments

Comments
 (0)