Manual revert of docker related changes

Author: hughns

.github/workflows/docker-publish.yml

@@ -2,9 +2,7 @@ name: Container Image
 
 on:
   push:
-    branches: 
-      - master
-      - sandhose/oidc-login
+    branches: [ master ]
     tags: [ 'v*' ]
   pull_request:
     branches: [ master ]
@@ -25,9 +23,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
       - name: Log into registry ${{ env.REGISTRY }}
         uses: docker/login-action@v1
         with:
@@ -40,17 +35,10 @@ jobs:
         uses: docker/metadata-action@v3
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=sha
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v2
         with:
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -1,30 +1,9 @@
-FROM --platform=${BUILDPLATFORM} docker.io/library/node:16.13-alpine3.15 as builder
+FROM docker.io/node:alpine as builder
 RUN apk add --no-cache git python3 build-base
+COPY . /app
 WORKDIR /app
+RUN yarn install \
+ && yarn build
 
-# Install the dependencies first
-COPY yarn.lock package.json ./
-RUN yarn install
-
-# Copy the rest and build the app
-COPY . .
-RUN yarn build
-
-# Remove the default config, replace it with a symlink to somewhere that will be updated at runtime
-RUN rm -f target/config.json \
-    && ln -sf /tmp/config.json target/config.json
-
-FROM --platform=${TARGETPLATFORM} docker.io/nginxinc/nginx-unprivileged:1.21-alpine
-
-# Copy the config template as well as the templating script
-COPY ./docker/config.json.tmpl /config.json.tmpl
-COPY ./docker/config-template.sh /docker-entrypoint.d/99-config-template.sh
-
-# Copy the built app from the first build stage
+FROM docker.io/nginx:alpine
 COPY --from=builder /app/target /usr/share/nginx/html
-
-# Values from the default config that can be overridden at runtime
-ENV PUSH_APP_ID="io.element.hydrogen.web" \
-    PUSH_GATEWAY_URL="https://matrix.org" \
-    PUSH_APPLICATION_SERVER_KEY="BC-gpSdVHEXhvHSHS0AzzWrQoukv2BE7KzpoPO_FfPacqOo3l1pdqz7rSgmB04pZCWaHPz7XRe6fjLaC-WPDopM" \
-    DEFAULT_HOMESERVER="matrix.org"

doc/docker.md

@@ -35,17 +35,15 @@ To stop the container, simply hit `ctrl+c`.
 
 In this repository, create a Docker image:
 
-```sh
-# Enable BuildKit https://docs.docker.com/develop/develop-images/build_enhancements/
-export DOCKER_BUILDKIT=1
+```
 docker build -t hydrogen .
 ```
 
-Or, pull the Docker image the GitHub Container Registry:
+Or, pull the docker image from GitLab:
 
 ```
-docker pull ghcr.io/vector-im/hydrogen
-docker tag ghcr.io/vector-im/hydrogen hydrogen
+docker pull registry.gitlab.com/jcgruenhage/hydrogen-web
+docker tag registry.gitlab.com/jcgruenhage/hydrogen-web hydrogen
 ```
 
 ### Start container image
@@ -55,6 +53,6 @@ Then, start up a container from that image:
 ```
 docker run \
     --name hydrogen \
-    --publish 8080:80 \
+    --publish 80:80 \
     hydrogen
 ```