Make templates parsing follow directory tree

.github/workflows/release-create.yml

@@ -20,25 +20,25 @@ jobs:
     name: Create GitHub Release and upload binary
     runs-on: ubuntu-latest
     steps:
-    - name: Set up Go
-      uses: actions/[email protected]
-      with:
-        go-version: 1.19
+      - name: Set up Go
+        uses: actions/[email protected]
+        with:
+          go-version: 1.23
 
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
-      with:
-        ref: "${{ inputs.branch }}"
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+        with:
+          ref: "${{ inputs.branch }}"
 
-    - name: Build binaries
-      run: go build ./cmd/openslides
+      - name: Build binaries
+        run: go build ./cmd/openslides
 
-    - name: Create release
-      uses: marvinpinto/action-automatic-releases@latest
-      with:
-        repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: "${{ inputs.tag }}"
-        prerelease: "${{ inputs.prerelease }}"
-        title: "${{ inputs.title }}"
-        files: |
-          openslides
+      - name: Create release
+        uses: marvinpinto/action-automatic-releases@latest
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "${{ inputs.tag }}"
+          prerelease: "${{ inputs.prerelease }}"
+          title: "${{ inputs.title }}"
+          files: |
+            openslides

.github/workflows/startup.yml

@@ -6,42 +6,42 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Set up Go
-      uses: actions/[email protected]
-      with:
-        go-version: 1.19
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
-
-    - name: Create manage auth password
-      run: echo "password" > manage_auth_password
-
-    - name: Build and start server with golang
-      run: |
-        go build ./cmd/server
-        MANAGE_AUTH_PASSWORD_FILE=manage_auth_password timeout --preserve-status --signal SIGINT 5s ./server
-
-    - name: Build and start manage with golang
-      run: |
-        go build ./cmd/openslides
-        ./openslides
-
-    - name: Build and start server with Docker
-      run: |
-        docker build . --tag openslides-manage
-        timeout --preserve-status --signal SIGINT 5s docker run --env MANAGE_AUTH_PASSWORD_FILE=/manage_auth_password --volume $PWD/manage_auth_password:/manage_auth_password openslides-manage
-      env:
-        DOCKER_BUILDKIT: 1
-
-    - name: Start development version of server with Makefile
-      run: |
-        make build-dev
-        timeout --preserve-status --signal SIGINT 5s docker run --env MANAGE_AUTH_PASSWORD_FILE=/manage_auth_password --volume $PWD/manage_auth_password:/manage_auth_password openslides-manage-dev
-      env:
-        DOCKER_BUILDKIT: 1
-
-    - name: Run tests with Makefile
-      run: make run-tests
-      env:
-        DOCKER_BUILDKIT: 1
+      - name: Set up Go
+        uses: actions/[email protected]
+        with:
+          go-version: 1.23
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Create manage auth password
+        run: echo "password" > manage_auth_password
+
+      - name: Build and start server with golang
+        run: |
+          go build ./cmd/server
+          MANAGE_AUTH_PASSWORD_FILE=manage_auth_password timeout --preserve-status --signal SIGINT 5s ./server
+
+      - name: Build and start manage with golang
+        run: |
+          go build ./cmd/openslides
+          ./openslides
+
+      - name: Build and start server with Docker
+        run: |
+          docker build . --tag openslides-manage
+          timeout --preserve-status --signal SIGINT 5s docker run --env MANAGE_AUTH_PASSWORD_FILE=/manage_auth_password --volume $PWD/manage_auth_password:/manage_auth_password openslides-manage
+        env:
+          DOCKER_BUILDKIT: 1
+
+      - name: Start development version of server with Makefile
+        run: |
+          make build-dev
+          timeout --preserve-status --signal SIGINT 5s docker run --env MANAGE_AUTH_PASSWORD_FILE=/manage_auth_password --volume $PWD/manage_auth_password:/manage_auth_password openslides-manage-dev
+        env:
+          DOCKER_BUILDKIT: 1
+
+      - name: Run tests with Makefile
+        run: make run-tests
+        env:
+          DOCKER_BUILDKIT: 1

.github/workflows/test.yml

@@ -6,22 +6,22 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Set up Go
-      uses: actions/[email protected]
-      with:
-        go-version: 1.19
+      - name: Set up Go
+        uses: actions/[email protected]
+        with:
+          go-version: 1.23
 
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
 
-    - name: go fmt
-      run: test -z $(gofmt -l .)
+      - name: go fmt
+        run: test -z $(gofmt -l .)
 
-    - name: go vet
-      run: go vet ./...
+      - name: go vet
+        run: go vet ./...
 
-    - name: golint
-      run: go install golang.org/x/lint/golint@latest && golint -set_exit_status ./...
+      - name: golint
+        run: go install golang.org/x/lint/golint@latest && golint -set_exit_status ./...
 
-    - name: go test
-      run: go test -timeout 10s -race ./...
+      - name: go test
+        run: go test -timeout 10s -race ./...

.gitignore

@@ -6,8 +6,10 @@
 /server
 
 # Generated files
-docker-compose.yml
 config.yml
+docker-compose.yml
+!pkg/config/templates/docker-compose.yml
+deployment/
 secrets/
 /inst
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.19-alpine as base
+FROM golang:1.23-alpine as base
 
 WORKDIR /root
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/OpenSlides/openslides-manage-service
 
-go 1.19
+go 1.23
 
 require (
 	github.com/ghodss/yaml v1.0.0