From 9537e5f263f7826b53c79a800b674bb668e4d614 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 18 Oct 2023 17:43:06 +0100 Subject: [PATCH 1/4] Ship OpenCoDE variant to Dockerhub Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/workflows/dockerhub.yaml | 15 ++++++++++++++- variants/OpenCoDE/build_config.yaml | 10 ++++++++++ variants/OpenCoDE/customisations.json | 3 +++ variants/OpenCoDE/customisations.json.license | 2 ++ 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 variants/OpenCoDE/build_config.yaml create mode 100644 variants/OpenCoDE/customisations.json create mode 100644 variants/OpenCoDE/customisations.json.license diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index f38a2fb6a32..21819b9f46b 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -12,11 +12,24 @@ jobs: name: Docker Buildx runs-on: ubuntu-latest environment: dockerhub + strategy: + fail-fast: false + matrix: + include: + - variant: vanilla + image: vectorim/element-web + - variant: opencode + image: vectorim/element-web-opencode + prepare: mv variants/OpenCoDE/* . steps: - uses: actions/checkout@v4 with: fetch-depth: 0 # needed for docker-package to be able to calculate the version + - name: Prepare + if: matrix.prepare + run: ${{ matrix.prepare }} + - name: Set up QEMU uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3 @@ -36,7 +49,7 @@ jobs: uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5 with: images: | - vectorim/element-web + ${{ matrix.image }} tags: | type=ref,event=branch type=ref,event=tag diff --git a/variants/OpenCoDE/build_config.yaml b/variants/OpenCoDE/build_config.yaml new file mode 100644 index 00000000000..8953e77f49f --- /dev/null +++ b/variants/OpenCoDE/build_config.yaml @@ -0,0 +1,10 @@ +# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS" +# SPDX-License-Identifier: Apache-2.0 +--- +# The modules to install. See ./docs/modules.md for more information on +# what modules are. +# +# The values of this are provided to `yarn add` for inclusion. +modules: + - "@nordeck/element-web-guest-module@1.0.0" + - "@nordeck/element-web-widget-lifecycle-module@1.0.1" diff --git a/variants/OpenCoDE/customisations.json b/variants/OpenCoDE/customisations.json new file mode 100644 index 00000000000..a10751dacd1 --- /dev/null +++ b/variants/OpenCoDE/customisations.json @@ -0,0 +1,3 @@ +{ + "src/customisations/ComponentVisibility.ts": "node_modules/@nordeck/element-web-guest-module/customisations/ComponentVisibility.ts" +} diff --git a/variants/OpenCoDE/customisations.json.license b/variants/OpenCoDE/customisations.json.license new file mode 100644 index 00000000000..23975ea6bdf --- /dev/null +++ b/variants/OpenCoDE/customisations.json.license @@ -0,0 +1,2 @@ +# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS" +# SPDX-License-Identifier: Apache-2.0 From a6f8dfc6ab459fafc8323a460c1eca87064b97b4 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 19 Oct 2023 09:16:14 +0100 Subject: [PATCH 2/4] Ship as variant suffix in the normal image Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/workflows/dockerhub.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index 21819b9f46b..4bc9346164e 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -17,9 +17,8 @@ jobs: matrix: include: - variant: vanilla - image: vectorim/element-web - variant: opencode - image: vectorim/element-web-opencode + flavor: suffix=-opencode,onlatest=true prepare: mv variants/OpenCoDE/* . steps: - uses: actions/checkout@v4 @@ -49,12 +48,13 @@ jobs: uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5 with: images: | - ${{ matrix.image }} + vectorim/element-web tags: | type=ref,event=branch type=ref,event=tag flavor: | latest=${{ contains(github.ref_name, '-rc.') && 'false' || 'auto' }} + ${{ matrix.flavor }} - name: Build and push uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5 From a14ff31d034314e05a7f7dde2636991b3b3960d2 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 19 Oct 2023 12:10:07 +0100 Subject: [PATCH 3/4] s/OpenCoDE/openDesk/ Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/workflows/dockerhub.yaml | 6 +++--- variants/openDesk/README.md | 1 + variants/{OpenCoDE => openDesk}/build_config.yaml | 0 variants/{OpenCoDE => openDesk}/customisations.json | 0 variants/{OpenCoDE => openDesk}/customisations.json.license | 0 5 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 variants/openDesk/README.md rename variants/{OpenCoDE => openDesk}/build_config.yaml (100%) rename variants/{OpenCoDE => openDesk}/customisations.json (100%) rename variants/{OpenCoDE => openDesk}/customisations.json.license (100%) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index 4bc9346164e..8c9ddd3f273 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -17,9 +17,9 @@ jobs: matrix: include: - variant: vanilla - - variant: opencode - flavor: suffix=-opencode,onlatest=true - prepare: mv variants/OpenCoDE/* . + - variant: opendesk + flavor: suffix=-opendesk,onlatest=true + prepare: mv variants/openDesk/* . steps: - uses: actions/checkout@v4 with: diff --git a/variants/openDesk/README.md b/variants/openDesk/README.md new file mode 100644 index 00000000000..f2aaf121c46 --- /dev/null +++ b/variants/openDesk/README.md @@ -0,0 +1 @@ +https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz diff --git a/variants/OpenCoDE/build_config.yaml b/variants/openDesk/build_config.yaml similarity index 100% rename from variants/OpenCoDE/build_config.yaml rename to variants/openDesk/build_config.yaml diff --git a/variants/OpenCoDE/customisations.json b/variants/openDesk/customisations.json similarity index 100% rename from variants/OpenCoDE/customisations.json rename to variants/openDesk/customisations.json diff --git a/variants/OpenCoDE/customisations.json.license b/variants/openDesk/customisations.json.license similarity index 100% rename from variants/OpenCoDE/customisations.json.license rename to variants/openDesk/customisations.json.license From 8809e37480ed7240dfe9ad914ad07a7ace82ef44 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 3 Nov 2023 10:36:14 +0000 Subject: [PATCH 4/4] Add comment Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/workflows/dockerhub.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dockerhub.yaml b/.github/workflows/dockerhub.yaml index 8c9ddd3f273..c2f904f13b0 100644 --- a/.github/workflows/dockerhub.yaml +++ b/.github/workflows/dockerhub.yaml @@ -17,6 +17,7 @@ jobs: matrix: include: - variant: vanilla + # Variant we ship to aid ESS in providing a build on the OpenCoDE platform including specific modules - variant: opendesk flavor: suffix=-opendesk,onlatest=true prepare: mv variants/openDesk/* .