diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 6ebb1e34..3d9418d3 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -93,8 +93,8 @@ jobs: registry: docker.io directory: ${{env.DIRECTORY}} dockerfile: ${{env.DOCKERFILE}} - #multiPlatform: true - #platform: linux/amd64 + multiPlatform: true + platform: linux/amd64 username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/docker/apphub/Dockerfile b/docker/apphub/Dockerfile index 407222f0..6e01ceb1 100644 --- a/docker/apphub/Dockerfile +++ b/docker/apphub/Dockerfile @@ -12,12 +12,11 @@ ENV websoft9_artifact="https://w9artifact.blob.core.windows.net/release/websoft9 ENV library_repo="https://github.com/Websoft9/docker-library" ENV source_github_pages="https://websoft9.github.io/websoft9" -SHELL ["/bin/bash", "-c"] - RUN apt update && apt install -y --no-install-recommends curl git jq cron iproute2 supervisor rsync wget unzip zip && \ git clone --depth=1 $library_repo && \ mv docker-library w9library && \ - + rm -rf w9library/.github && \ + # supervisor COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf