From d904c7d9dd715c32c124548b0dd9cdc99994226e Mon Sep 17 00:00:00 2001 From: buanet Date: Sat, 28 Aug 2021 23:45:14 +0200 Subject: [PATCH] renaming/restructuring --- ...ev-slim.yml => build-debian-image-dev.yml} | 28 +++++++++---------- .../Dockerfile-amd64 | 6 ++-- {slim => debian}/scripts/healthcheck.sh | 0 {slim => debian}/scripts/iobroker_startup.sh | 0 {slim => debian}/scripts/maintenance.sh | 0 {slim => debian}/scripts/setup_avahi.sh | 0 {slim => debian}/scripts/setup_packages.sh | 0 {slim => debian}/scripts/setup_zwave.sh | 0 .../userscript_everystart_example.sh | 0 .../userscript_firststart_example.sh | 0 10 files changed, 16 insertions(+), 18 deletions(-) rename .github/workflows/{build-image-dev-slim.yml => build-debian-image-dev.yml} (76%) rename slim/Dockerfile-slim-amd64 => debian/Dockerfile-amd64 (97%) rename {slim => debian}/scripts/healthcheck.sh (100%) rename {slim => debian}/scripts/iobroker_startup.sh (100%) rename {slim => debian}/scripts/maintenance.sh (100%) rename {slim => debian}/scripts/setup_avahi.sh (100%) rename {slim => debian}/scripts/setup_packages.sh (100%) rename {slim => debian}/scripts/setup_zwave.sh (100%) rename {slim => debian}/userscripts/userscript_everystart_example.sh (100%) rename {slim => debian}/userscripts/userscript_firststart_example.sh (100%) diff --git a/.github/workflows/build-image-dev-slim.yml b/.github/workflows/build-debian-image-dev.yml similarity index 76% rename from .github/workflows/build-image-dev-slim.yml rename to .github/workflows/build-debian-image-dev.yml index aec9e27..d86f6f9 100644 --- a/.github/workflows/build-image-dev-slim.yml +++ b/.github/workflows/build-debian-image-dev.yml @@ -1,5 +1,5 @@ # Github action to build Docker image from dev branch (tag: dev) -name: Build slim image from dev +name: Build debian based image from dev on: workflow_dispatch: @@ -8,7 +8,7 @@ on: - dev jobs: - bulid-dev-slim: + bulid-dev: runs-on: ubuntu-latest steps: - name: Checkout repo (dev) @@ -30,11 +30,11 @@ jobs: echo "This is the Buildnumber/Timestamp: $DATI" echo "dati=$DATI" >> $GITHUB_ENV # startup script - sed -e "s/\${VERSION}/$VERSION-slim-dev/" -e "s/\${BUILD}/$DATI/" ./slim/scripts/iobroker_startup.sh > ./slim/scripts/iobroker_startup.tmp - mv -f ./slim/scripts/iobroker_startup.tmp ./slim/scripts/iobroker_startup.sh + 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-slim-dev/" -e "s/\${DATI}/$DATI/" ./slim/Dockerfile-slim-amd64 > ./slim/Dockerfile-slim-amd64.tmp - mv -f ./slim/Dockerfile-slim-amd64.tmp ./slim/Dockerfile-slim-amd64 + sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" ./debian/Dockerfile-amd64 > ./debian/Dockerfile-amd64.tmp + mv -f ./debian/Dockerfile-amd64.tmp ./debian/Dockerfile-amd64 - name: Set up manifest tool run: | @@ -64,20 +64,20 @@ jobs: - name: Build Docker image (slim-amd64) uses: docker/build-push-action@v2.6.1 with: - context: ./slim - file: ./slim/Dockerfile-slim-amd64 + context: ./debian + file: ./debian/Dockerfile-amd64 push: true platforms: linux/amd64 tags: | - buanet/iobroker:dev-slim-amd64, - ghcr.io/buanet/iobroker:dev-slim-amd64 + buanet/iobroker:dev-amd64, + ghcr.io/buanet/iobroker:dev-amd64 - name: Create and push manifests run: | - sed -e "s/\${VERSION}/dev-slim/g" -e "s/\${DOCKERTAG}/dev-slim/g" ./manifest.yml > manifest_dev-slim.yaml - #./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_dev-slim.yaml - sed -e "s/\${VERSION}/dev-slim/g" -e "s/\${DOCKERTAG}/dev-slim/g" ./manifest_ghcr.yml > manifest_ghcr_dev-slim.yaml - #./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_dev-slim.yaml + sed -e "s/\${VERSION}/dev/g" -e "s/\${DOCKERTAG}/dev/g" ./manifest.yml > manifest_dev.yaml + #./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_dev.yaml + sed -e "s/\${VERSION}/dev/g" -e "s/\${DOCKERTAG}/dev/g" ./manifest_ghcr.yml > manifest_ghcr_dev.yaml + #./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_dev.yaml - name: Delete untagged images from GitHub packages uses: actions/github-script@v3 diff --git a/slim/Dockerfile-slim-amd64 b/debian/Dockerfile-amd64 similarity index 97% rename from slim/Dockerfile-slim-amd64 rename to debian/Dockerfile-amd64 index 2aa4bfa..a05be5e 100644 --- a/slim/Dockerfile-slim-amd64 +++ b/debian/Dockerfile-amd64 @@ -15,8 +15,10 @@ RUN apt-get update && apt-get install -y \ gosu \ jq \ locales \ + procps \ sudo \ udev \ + wget \ && rm -rf /var/lib/apt/lists/* # Install node @@ -51,10 +53,6 @@ RUN apt-get update \ && echo $(hostname) > /opt/.firstrun \ && rm -rf /var/lib/apt/lists/* -# Install node-gyp -# WORKDIR /opt/iobroker/ -# RUN npm install -g node-gyp - # Backup initial ioBroker and userscript folder RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \ && tar -cf /opt/initial_userscripts.tar /opt/userscripts diff --git a/slim/scripts/healthcheck.sh b/debian/scripts/healthcheck.sh similarity index 100% rename from slim/scripts/healthcheck.sh rename to debian/scripts/healthcheck.sh diff --git a/slim/scripts/iobroker_startup.sh b/debian/scripts/iobroker_startup.sh similarity index 100% rename from slim/scripts/iobroker_startup.sh rename to debian/scripts/iobroker_startup.sh diff --git a/slim/scripts/maintenance.sh b/debian/scripts/maintenance.sh similarity index 100% rename from slim/scripts/maintenance.sh rename to debian/scripts/maintenance.sh diff --git a/slim/scripts/setup_avahi.sh b/debian/scripts/setup_avahi.sh similarity index 100% rename from slim/scripts/setup_avahi.sh rename to debian/scripts/setup_avahi.sh diff --git a/slim/scripts/setup_packages.sh b/debian/scripts/setup_packages.sh similarity index 100% rename from slim/scripts/setup_packages.sh rename to debian/scripts/setup_packages.sh diff --git a/slim/scripts/setup_zwave.sh b/debian/scripts/setup_zwave.sh similarity index 100% rename from slim/scripts/setup_zwave.sh rename to debian/scripts/setup_zwave.sh diff --git a/slim/userscripts/userscript_everystart_example.sh b/debian/userscripts/userscript_everystart_example.sh similarity index 100% rename from slim/userscripts/userscript_everystart_example.sh rename to debian/userscripts/userscript_everystart_example.sh diff --git a/slim/userscripts/userscript_firststart_example.sh b/debian/userscripts/userscript_firststart_example.sh similarity index 100% rename from slim/userscripts/userscript_firststart_example.sh rename to debian/userscripts/userscript_firststart_example.sh