Merge pull request #307 from compose-generator/release/v1.8.x

Release of version 1.8.0
compose-generator · Apr 17, 2022 · cc4f0f6 · cc4f0f6
2 parents 9a09e1a + d4eeba4
commit cc4f0f6
Show file tree

Hide file tree

Showing 433 changed files with 15,824 additions and 3,285 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,7 +8,7 @@ updates:
       time: "04:00"
       timezone: Europe/Berlin
     open-pull-requests-limit: 15
-    target-branch: release/v1.8.x
+    target-branch: release/v1.9.x
     reviewers:
       - marcauberer
     assignees:
@@ -22,7 +22,7 @@ updates:
       time: "04:00"
       timezone: Europe/Berlin
     open-pull-requests-limit: 15
-    target-branch: release/v1.8.x
+    target-branch: release/v1.9.x
     reviewers:
       - marcauberer
     assignees:
@@ -36,7 +36,7 @@ updates:
       time: "04:00"
       timezone: Europe/Berlin
     open-pull-requests-limit: 15
-    target-branch: release/v1.8.x
+    target-branch: release/v1.9.x
     reviewers:
       - marcauberer
     assignees:
@@ -50,7 +50,7 @@ updates:
       time: "04:00"
       timezone: Europe/Berlin
     open-pull-requests-limit: 15
-    target-branch: release/v1.8.x
+    target-branch: release/v1.9.x
     reviewers:
       - marcauberer
     assignees:

diff --git a/.github/scripts/service-validator/service-schema.py b/.github/scripts/service-validator/service-schema.py
@@ -52,5 +52,8 @@
     'cap_add': {
         'type': 'list',
         'nullable': True
+    },
+    'working_dir': {
+        'type': 'string'
     }
 }
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,20 +15,24 @@ jobs:
   build:
     strategy:
       matrix:
-        go-version: [ 1.16.x, 1.17.x ]
-        os: [ ubuntu-latest, windows-latest ]
+        go-version:
+          - 1.17.x
+          - 1.18.x
+        os:
+          - ubuntu-latest
+          - windows-latest
     runs-on: ${{ matrix.os }}
     steps:
     - name: Install Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
         go-version: ${{ matrix.go-version }}
 
     - name: Prepare environment
-      run: go get -u golang.org/x/lint/golint
+      run: go install golang.org/x/lint/golint@latest
 
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Run vet & lint
       working-directory: src

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v1

diff --git a/.github/workflows/copyright.yml b/.github/workflows/copyright.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Get branch name
         id: vars
@@ -29,7 +29,7 @@ jobs:
           FileType: '.go'
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           base: ${{ steps.vars.outputs.short_ref }}

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -19,10 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: 3.x
 

diff --git a/.github/workflows/misspell.yml b/.github/workflows/misspell.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Misspell
         uses: reviewdog/action-misspell@v1

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -14,17 +14,17 @@ jobs:
       DOCKER_CLI_EXPERIMENTAL: enabled
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.17.x
+          go-version: 1.18.x
 
       - name: Cache Go modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -60,7 +60,7 @@ jobs:
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:
-          version: v1.2.3
+          version: v1.8.2
           args: release --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -69,7 +69,7 @@ jobs:
           #TWITTER_ACCESS_TOKEN: ${{ secrets.TWITTER_ACCESS_TOKEN }}
           #TWITTER_ACCESS_TOKEN_SECRET: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: dist-output
           path: dist/
@@ -94,7 +94,7 @@ jobs:
         uses: battila7/get-version-action@v2
 
       - name: Download dist output
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: dist-output
 
@@ -108,6 +108,7 @@ jobs:
 
       - name: Deploy to Raspbian
         run: |
+          curl -sSf -u "${{ secrets.NEXUS_USERNAME }}:${{ secrets.NEXUS_PASSWORD }}" -H "Content-Type: multipart/form-data" --data-binary "@./compose-generator_${{ matrix.arch }}.deb" "${{ secrets.NEXUS_URL }}/raspbian-bullseye/"
           curl -sSf -u "${{ secrets.NEXUS_USERNAME }}:${{ secrets.NEXUS_PASSWORD }}" -H "Content-Type: multipart/form-data" --data-binary "@./compose-generator_${{ matrix.arch }}.deb" "${{ secrets.NEXUS_URL }}/raspbian-buster/"
           curl -sSf -u "${{ secrets.NEXUS_USERNAME }}:${{ secrets.NEXUS_PASSWORD }}" -H "Content-Type: multipart/form-data" --data-binary "@./compose-generator_${{ matrix.arch }}.deb" "${{ secrets.NEXUS_URL }}/raspbian-stretch/"
       
@@ -149,7 +150,7 @@ jobs:
             }
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Get version name
         id: get_version

diff --git a/.github/workflows/service-testing.yml b/.github/workflows/service-testing.yml
@@ -14,15 +14,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
+
+    - name: Upgrade apt packages
+      run: sudo apt-get update && sudo apt-get upgrade -y
 
     - name: Install Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.17.x
+        go-version: 1.18.x
 
     - name: Setup Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: 3.x
 
@@ -33,7 +36,7 @@ jobs:
     - name: Install CCom
       run: |
         curl -fsSL https://server.chillibits.com/files/repo/gpg | sudo apt-key add -
-        sudo add-apt-repository "deb https://admin.repo.chillibits.com/repository/ubuntu-$(lsb_release -cs) $(lsb_release -cs) main"
+        sudo add-apt-repository "deb https://repo.chillibits.com/ubuntu-$(lsb_release -cs) $(lsb_release -cs) main"
         sudo apt-get update
         sudo apt-get install ccom
 

diff --git a/.github/workflows/service-validation.yml b/.github/workflows/service-validation.yml
@@ -16,10 +16,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Setup Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: 3.x
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,14 +18,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Install Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.17.x
+        go-version: 1.18.x
 
     - name: Checkout code
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
+      uses: actions/checkout@v3
 
     - name: Install CCom
       run: |
@@ -42,7 +40,7 @@ jobs:
       run: bash <(curl -s https://codecov.io/bash)
 
     - name: Install GoSec
-      run: curl -sfL https://raw.githubusercontent.com/securego/gosec/v2.9.1/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.9.1
+      run: curl -sfL https://raw.githubusercontent.com/securego/gosec/v2.11.0/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.11.0
 
     - name: Run security scan
       working-directory: src

diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ There are downloadable packages available for all supported platforms:
 | **Windows Portable (zip)**  | [download](https://github.com/compose-generator/compose-generator/releases/latest/download/compose-generator_windows_amd64.zip)   | [download](https://github.com/compose-generator/compose-generator/releases/latest/download/compose-generator_windows_386.zip) | -                                                                                                                       | -                                                                                                                       | -                                                                                                                       | -                                                                                                                       |
 
 ## Contribute by providing predefined templates
-If you miss a predefined template and you want to create one for the public, please read the [instructions to create a template](./predefined-services/README.md). Fork the repository, create the template and open a pr against the `release/v1.8.x` branch.
+If you miss a predefined template and you want to create one for the public, please read the [instructions to create a template](./predefined-services/README.md). Fork the repository, create the template and open a pr against the `release/v1.9.x` branch.
 The community is thankful for every predefined template!
 
 ## Contribute otherwise to the project

diff --git a/docs/docs/install/linux.md b/docs/docs/install/linux.md
@@ -33,7 +33,7 @@ title: Install on Linux
     To install Compose Generator on Raspbian, execute the following commands in your terminal:
     ```sh
     sudo apt-get install ca-certificates
-    curl -fsSL https://server.chillibits.com/files/repo/gpg | sudo apt-key add -
+    curl -fsSL https://server.chillibits.com/files/repo/gpg | sudo tee /etc/apt/trusted.gpg.d/chillibits.asc
 	sudo echo "deb [arch=armhf] https://repo.chillibits.com/$(lsb_release -is | awk '{print tolower($0)}')-$(lsb_release -cs) $(lsb_release -cs) main" > /etc/apt/sources.list.d/chillibits.list
 	sudo apt-get update
 	sudo apt-get install compose-generator
@@ -101,4 +101,4 @@ You also can install Compose Generator from a package file on your host system.
 ### Use
 ```sh
 compose-generator [<command>]
-```
+```
diff --git a/docs/docs/install/source.md b/docs/docs/install/source.md
@@ -12,7 +12,7 @@ cd compose-generator
 ```
 
 #### Install Go
-For compiling Compose Generator from source you need to have Go 1.16 or higher installed on your system. Please refer to the [official guide](https://golang.org/doc/install) on how to install Go.
+For compiling Compose Generator from source you need to have Go 1.17 or higher installed on your system. Please refer to the [official guide](https://golang.org/doc/install) on how to install Go.
 
 ### Build from source
 If you want to build the executable, you can use the `build.sh` for Linux or the `build.bat` file for Windows:
@@ -43,4 +43,4 @@ If you don't care about the executable and you just want to use Compose Generato
 ### Use
 ```sh
 compose-generator [<command>]
-```
+```