diff --git a/.VERSION b/.VERSION index 3a3fd04..52b9e40 100644 --- a/.VERSION +++ b/.VERSION @@ -1 +1 @@ -v7.0.0-beta.1 \ No newline at end of file +v7.0.0 \ No newline at end of file diff --git a/.github/workflows/build-debian-image-beta-node16.yml b/.github/workflows/build-debian-image-beta-node16.yml deleted file mode 100644 index 7bfc272..0000000 --- a/.github/workflows/build-debian-image-beta-node16.yml +++ /dev/null @@ -1,128 +0,0 @@ -# Github action to build Docker image from beta branch (tag: beta) -name: Build debian beta-node16 - -on: - release: - types: [prereleased] - workflow_dispatch: - -jobs: - build-beta-node16-image: - runs-on: ubuntu-latest - steps: - - name: Getting published prerelease tag - run: echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - - - name: Checkout repo - uses: actions/checkout@v3 - with: - repository: 'buanet/ioBroker.docker' - ref: ${{ env.RELEASE_TAG }} - - - name: Get and write version and date - id: version - run: | - VERSION="$(cat .VERSION)" - MAJORVERSION="$(cat .VERSION | cut -c 1-2 | sed -r 's#^(.{0})#\1latest-#')" - DATI="$(date --rfc-3339=seconds | sed 's/ /T/')" - echo "This is the Version: $VERSION" - echo "version=$VERSION" >> $GITHUB_ENV - echo "This is the Major Version: $MAJORVERSION" - echo "majorversion=$MAJORVERSION" >> $GITHUB_ENV - echo "This is the Buildnumber/Timestamp: $DATI" - echo "dati=$DATI" >> $GITHUB_ENV - # startup script - sed -e "s/\${VERSION}/$VERSION/" -e "s/\${BUILD}/$DATI/" ./debian/scripts/iobroker_startup.sh > ./debian/scripts/iobroker_startup.tmp - mv -f ./debian/scripts/iobroker_startup.tmp ./debian/scripts/iobroker_startup.sh - # amd64 - sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" ./debian/node16/Dockerfile > ./debian/node16/Dockerfile.tmp - mv -f ./debian/node16/Dockerfile.tmp ./debian/node16/Dockerfile - - - name: Set up manifest tool - run: | - wget https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64 -O manifest-tool - chmod +x manifest-tool - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2.0.0 - - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v2.0.0 - - - name: Login to DockerHub - uses: docker/login-action@v2.0.0 - with: - username: ${{ secrets.DOCKER_USER }} - password: ${{ secrets.DOCKER_PASS }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v2.0.0 - with: - registry: ghcr.io - username: ${{ secrets.PACKAGES_USER }} - password: ${{ secrets.PACKAGES_PASS }} - - - name: Build Docker image (node16-amd64) - uses: docker/build-push-action@v3.0.0 - with: - context: ./debian - file: ./debian/node16/Dockerfile - push: true - platforms: linux/amd64 - tags: | - buanet/iobroker:${{ env.version }}-node16-amd64, - ghcr.io/buanet/iobroker:${{ env.version }}-node16-amd64 - - - name: Build Docker image (node16-arm32v7) - uses: docker/build-push-action@v3.0.0 - with: - context: ./debian - file: ./debian/node16/Dockerfile - push: true - platforms: linux/arm/v7 - tags: | - buanet/iobroker:${{ env.version }}-node16-arm32v7, - ghcr.io/buanet/iobroker:${{ env.version }}-node16-arm32v7 - - - name: Build Docker image (node16-arm64v8) - uses: docker/build-push-action@v3.0.0 - with: - context: ./debian - file: ./debian/node16/Dockerfile - push: true - platforms: linux/arm64/v8 - tags: | - buanet/iobroker:${{ env.version }}-node16-arm64v8, - ghcr.io/buanet/iobroker:${{ env.version }}-node16-arm64v8 - - - name: Create and push manifests - run: | - sed -e "s/\${VERSION}/${{ env.version }}-node16/g" -e "s/\${DOCKERTAG}/beta-node16/g" ./manifest.yml > manifest_beta-node16.yaml - ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_beta-node16.yaml - sed -e "s/\${VERSION}/${{ env.version }}-node16/g" -e "s/\${DOCKERTAG}/beta-node16/g" ./manifest_ghcr.yml > manifest_ghcr_beta-node16.yaml - ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_beta-node16.yaml - sed -e "s/\${VERSION}/${{ env.version }}-node16/g" -e "s/\${DOCKERTAG}/${{ env.version }}-node16/g" ./manifest.yml > manifest_version-node16.yaml - ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_version-node16.yaml - sed -e "s/\${VERSION}/${{ env.version }}-node16/g" -e "s/\${DOCKERTAG}/${{ env.version }}-node16/g" ./manifest_ghcr.yml > manifest_ghcr_version-node16.yaml - ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_version-node16.yaml - - - name: Delete untagged images from GitHub packages - uses: actions/github-script@v6 - with: - github-token: ${{ secrets.PACKAGES_PASS }} - script: | - const response = await github.request("GET /users/${{ env.OWNER }}/packages/container/${{ env.PACKAGE_NAME }}/versions", - { per_page: ${{ env.PER_PAGE }} - }); - for(version of response.data) { - if (version.metadata.container.tags.length == 0) { - console.log("delete " + version.id) - const deleteResponse = await github.request("DELETE /user/packages/container/${{ env.PACKAGE_NAME }}/versions/" + version.id, { }); - console.log("status " + deleteResponse.status) - } - } - env: - OWNER: buanet - PACKAGE_NAME: iobroker - PER_PAGE: 100 diff --git a/.github/workflows/build-debian-image-dev-node16.yml b/.github/workflows/build-debian-image-dev-node16.yml deleted file mode 100644 index 9ce5a65..0000000 --- a/.github/workflows/build-debian-image-dev-node16.yml +++ /dev/null @@ -1,119 +0,0 @@ -# Github action to build Docker image from dev branch (tag: dev) -name: Build debian dev-node16 - -on: - workflow_dispatch: - -jobs: - build-dev-node16-image: - runs-on: ubuntu-latest - steps: - - name: Checkout repo (dev) - uses: actions/checkout@v3 - with: - repository: 'buanet/ioBroker.docker' - ref: 'main' - - - name: Get and write version and date - id: version - run: | - VERSION="$(cat .VERSION)" - MAJORVERSION="$(cat .VERSION | cut -c 1-2 | sed -r 's#^(.{0})#\1latest-#')" - DATI="$(date --rfc-3339=seconds | sed 's/ /T/')" - echo "This is the Version: $VERSION" - echo "version=$VERSION" >> $GITHUB_ENV - echo "This is the Major Version: $MAJORVERSION" - echo "majorversion=$MAJORVERSION" >> $GITHUB_ENV - echo "This is the Buildnumber/Timestamp: $DATI" - echo "dati=$DATI" >> $GITHUB_ENV - # startup script - sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${BUILD}/$DATI/" ./debian/scripts/iobroker_startup.sh > ./debian/scripts/iobroker_startup.tmp - mv -f ./debian/scripts/iobroker_startup.tmp ./debian/scripts/iobroker_startup.sh - # amd64 - sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" ./debian/node16/Dockerfile > ./debian/node16/Dockerfile.tmp - mv -f ./debian/node16/Dockerfile.tmp ./debian/node16/Dockerfile - - - name: Set up manifest tool - run: | - wget https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64 -O manifest-tool - chmod +x manifest-tool - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2.0.0 - - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v2.0.0 - - - name: Login to DockerHub - uses: docker/login-action@v2.0.0 - with: - username: ${{ secrets.DOCKER_USER }} - password: ${{ secrets.DOCKER_PASS }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v2.0.0 - with: - registry: ghcr.io - username: ${{ secrets.PACKAGES_USER }} - password: ${{ secrets.PACKAGES_PASS }} - - - name: Build Docker image (node16-amd64) - uses: docker/build-push-action@v3.0.0 - with: - context: ./debian - file: ./debian/node16/Dockerfile - push: true - platforms: linux/amd64 - tags: | - buanet/iobroker:dev-node16-amd64, - ghcr.io/buanet/iobroker:dev-node16-amd64 - - - name: Build Docker image (node16-arm32v7) - uses: docker/build-push-action@v3.0.0 - with: - context: ./debian - file: ./debian/node16/Dockerfile - push: true - platforms: linux/arm/v7 - tags: | - buanet/iobroker:dev-node16-arm32v7, - ghcr.io/buanet/iobroker:dev-node16-arm32v7 - - - name: Build Docker image (node16-arm64v8) - uses: docker/build-push-action@v3.0.0 - with: - context: ./debian - file: ./debian/node16/Dockerfile - push: true - platforms: linux/arm64/v8 - tags: | - buanet/iobroker:dev-node16-arm64v8, - ghcr.io/buanet/iobroker:dev-node16-arm64v8 - - - name: Create and push manifests - run: | - sed -e "s/\${VERSION}/dev-node16/g" -e "s/\${DOCKERTAG}/dev-node16/g" ./manifest.yml > manifest_dev-node16.yaml - ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_dev-node16.yaml - sed -e "s/\${VERSION}/dev-node16/g" -e "s/\${DOCKERTAG}/dev-node16/g" ./manifest_ghcr.yml > manifest_ghcr_dev-node16.yaml - ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_dev-node16.yaml - - - name: Delete untagged images from GitHub packages - uses: actions/github-script@v6 - with: - github-token: ${{ secrets.PACKAGES_PASS }} - script: | - const response = await github.request("GET /users/${{ env.OWNER }}/packages/container/${{ env.PACKAGE_NAME }}/versions", - { per_page: ${{ env.PER_PAGE }} - }); - for(version of response.data) { - if (version.metadata.container.tags.length == 0) { - console.log("delete " + version.id) - const deleteResponse = await github.request("DELETE /user/packages/container/${{ env.PACKAGE_NAME }}/versions/" + version.id, { }); - console.log("status " + deleteResponse.status) - } - } - env: - OWNER: buanet - PACKAGE_NAME: iobroker - PER_PAGE: 100 diff --git a/CHANGELOG.md b/CHANGELOG.md index b77d273..b3f1e45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,13 @@ ## Changelog -### v7.0.0-beta.1 (16.06.2022) -* upgrade node version to recommended node16 -* rewrite maintenance script ([#243 by @agross](https://github.com/buanet/ioBroker.docker/pull/243)) -* enhance container shutdown on SIGTERM ([as requested with #264 by @buzz0r](https://github.com/buanet/ioBroker.docker/pull/264)) -* enhance startup script logging -* enhance logging for avahi & zwave install scripts -* add new env for offline mode (fixes [#255](https://github.com/buanet/ioBroker.docker/issues/255)) +### v7.0.0 (21.06.2022) +* update docs & ci +* v7.0.0-beta.1 (16.06.2022) + * upgrade node version to recommended node16 + * rewrite maintenance script ([#243 by @agross](https://github.com/buanet/ioBroker.docker/pull/243)) + * enhance container shutdown on SIGTERM ([as requested with #264 by @buzz0r](https://github.com/buanet/ioBroker.docker/pull/264)) + * enhance startup script logging + * enhance logging for avahi & zwave install scripts + * add new env for offline mode (fixes [#255](https://github.com/buanet/ioBroker.docker/issues/255)) ### v6.1.0 (2022-03-01) * v6.1.0-beta.2 (2022-02-11) @@ -20,7 +22,7 @@ * add alias "m" for maintenance script ### v6.0.0 (2021-12-09) -* move docu/ restructuring readme +* move docs/ restructuring readme * v6.0.0-beta1 (2021-10-07) * upgrade node version to recommended node14 * add beta-node16 tag for beta testing node16 diff --git a/docs/README_docker_hub_buanet.md b/docs/README_docker_hub_buanet.md index 099690e..3339d1f 100644 --- a/docs/README_docker_hub_buanet.md +++ b/docs/README_docker_hub_buanet.md @@ -26,10 +26,13 @@ New major image versions (e.g. v4, v5, v6) always come with a new major version # Supported tags -It is highly recommended not to use the `latest` tag for production, especially when using any kind of automated update procedure like watchtower. Please use the `latest-vX` tag instead. +It is highly recommended not to use the `latest` tag for production, especially when using any kind of automated update procedure like watchtower. Please use the `latest-v[X]` tag instead. + +### Node 16 versions +* [`v7.0.0`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`v7.0.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`v7.0.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`v7.0.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`latest-v7`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile) ### Node 14 versions -* [`v6.1.0`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`latest-v6`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile) +* [`v6.1.0`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`latest-v6`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile) * [`v6.0.0`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile) ### Node 12 versions @@ -109,6 +112,7 @@ You could use environment variables to auto configure your ioBroker container on * `LANG` (optional, default: de_DE.UTF‑8) The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8 * `LANGUAGE` (optional, default: de_DE:de) The following locales are pre-generated: de_DE:de, en_US:en * `LC_ALL` (optional, default: de_DE.UTF-8) The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8 +* `OFFLINE_MODE` (optional & experimental, default: false) Set true if you container has no or limited internet connection * `PACKAGES` (optional) Installs additional linux packages to your container, packages should be separated by whitespace like this: "package1 package2 package3". * `SETGID` (default: 1000) In some cases it might be useful to specify the gid of the containers iobroker user to match an existing group on the docker host * `SETUID` (default: 1000) In some cases it might be useful to specify the uid of the containers iobroker user to match an existing user on the docker host diff --git a/docs/README_docker_hub_iobroker.md b/docs/README_docker_hub_iobroker.md index 2340f67..9edc555 100644 --- a/docs/README_docker_hub_iobroker.md +++ b/docs/README_docker_hub_iobroker.md @@ -27,10 +27,13 @@ New major image versions (e.g. v4, v5, v6) always come with a new major version # Supported tags -It is highly recommended not to use the `latest` tag for production, especially when using any kind of automated update procedure like watchtower. Please use the `latest-vX` tag instead. +It is highly recommended not to use the `latest` tag for production, especially when using any kind of automated update procedure like watchtower. Please use the `latest-v[X]` tag instead. + +### Node 16 versions +* [`v7.0.0`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`v7.0.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`v7.0.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`v7.0.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`latest-v7`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v7.0.0/debian/node16/Dockerfile) ### Node 14 versions -* [`v6.1.0`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`latest-v6`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile) +* [`v6.1.0`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`v6.1.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile), [`latest-v6`](https://github.com/buanet/ioBroker.docker/blob/v6.1.0/debian/node14/Dockerfile) * [`v6.0.0`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile), [`v6.0.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v6.0.0/debian/node14/Dockerfile) ### Node 12 versions @@ -110,6 +113,7 @@ You could use environment variables to auto configure your ioBroker container on * `LANG` (optional, default: de_DE.UTF‑8) The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8 * `LANGUAGE` (optional, default: de_DE:de) The following locales are pre-generated: de_DE:de, en_US:en * `LC_ALL` (optional, default: de_DE.UTF-8) The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8 +* `OFFLINE_MODE` (optional & experimental, default: false) Set true if you container has no or limited internet connection * `PACKAGES` (optional) Installs additional linux packages to your container, packages should be separated by whitespace like this: "package1 package2 package3". * `SETGID` (default: 1000) In some cases it might be useful to specify the gid of the containers iobroker user to match an existing group on the docker host * `SETUID` (default: 1000) In some cases it might be useful to specify the uid of the containers iobroker user to match an existing user on the docker host