From b4a034d900ca79d3b8cacf56b130a5f15c3b0c58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <openslides@normanjaeckel.de>
Date: Fri, 30 Apr 2021 11:19:21 +0200
Subject: [PATCH] Switched to GitHub Container Registry.

---
 .github/workflows/build_images.yml | 8 ++++----
 .github/workflows/models.yml       | 6 ++++--
 README.md                          | 2 +-
 openslides-manage-service          | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build_images.yml b/.github/workflows/build_images.yml
index 5046d16a9..5b061f316 100644
--- a/.github/workflows/build_images.yml
+++ b/.github/workflows/build_images.yml
@@ -55,9 +55,9 @@ jobs:
     - name: Build image
       working-directory: ${{ matrix.service.directory }}
       env:
-        DOCKER_BUILDKIT=1
+        DOCKER_BUILDKIT: 1
       run: |
-        if [ ${{ matrix.service.args }} != "" ]
+        if [ "${{ matrix.service.args }}" != "" ]
         then
           export BUILD_ARGS="--build-arg MODULE=${{ matrix.service.args.MODULE }}
                              --build-arg PORT=${{ matrix.service.args.PORT }}"
@@ -66,11 +66,11 @@ jobs:
 
     - name: Log into registry
       run: echo "${{ secrets.GITHUB_TOKEN }}" |
-           docker login docker.pkg.github.com --username ${{ github.actor }} --password-stdin
+           docker login ghcr.io --username ${{ github.actor }} --password-stdin
 
     - name: Push image
       run: |
-        IMAGE_ID=docker.pkg.github.com/${{ github.repository }}/${{ matrix.service.name }}
+        IMAGE_ID=ghcr.io/${{ github.repository }}/${{ matrix.service.name }}
 
         # Change all uppercase to lowercase
         IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
diff --git a/.github/workflows/models.yml b/.github/workflows/models.yml
index 874cb7c43..c9c28f56c 100644
--- a/.github/workflows/models.yml
+++ b/.github/workflows/models.yml
@@ -1,7 +1,9 @@
-name: Validate models.yml
+---
+name: Validate models.yml and initial and example data
 on: [push, pull_request]
 env:
   PYTHON_VERSION: 3.8.5
+  GO_VERSION: 1.15
 jobs:
   validate-models:
     name: Validate models.yml
@@ -10,7 +12,7 @@ jobs:
     - name: Set up Go 1.15
       uses: actions/setup-go@v1
       with:
-        go-version: 1.15
+        go-version: ${{ env.GO_VERSION }}
 
     - name: Check out code
       uses: actions/checkout@v2
diff --git a/README.md b/README.md
index 0abce5ae9..0779c268d 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Create configuration files:
 Build and start Docker containers. According to your Docker installation you may
 have to run this as root:
 
-    $ docker-compose up --build --detach
+    $ docker-compose up --detach
 
 Setup initial-data:
 
diff --git a/openslides-manage-service b/openslides-manage-service
index 2982c8880..d1bd16193 160000
--- a/openslides-manage-service
+++ b/openslides-manage-service
@@ -1 +1 @@
-Subproject commit 2982c8880184cfab59a9792e79c62435ffc46f8d
+Subproject commit d1bd161936e304c18336e3c1cc94609c8b39e952