diff --git a/.github/workflows/appmanage_docker.yml b/.github/workflows/appmanage_docker.yml index d6f15417..4b058ddf 100644 --- a/.github/workflows/appmanage_docker.yml +++ b/.github/workflows/appmanage_docker.yml @@ -2,11 +2,11 @@ name: Docker Build And Push To Docker Hub on: push: - branches: [ main ] - paths: - - 'appmanage/Dockerfile' - - 'appmanage/main.py' - - 'appmanage/config/*' + branches: [main] + paths: + - "appmanage/Dockerfile" + - "appmanage/main.py" + - "appmanage/config/*" jobs: build: @@ -17,20 +17,22 @@ jobs: steps: - uses: actions/checkout@v2 name: Check out code - + - uses: mr-smithers-excellent/docker-build-push@v5 name: Build & push Docker image with: image: websoft9dev/appmanage - tags: latest + tags: + - "latest" + - "0.1.0" registry: docker.io dockerfile: appmanage/Dockerfile directory: appmanage username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - + - name: add readme file - run: | + run: | cd appmanage touch myread.md echo "This repository is the easiest appmanage deployment on GitHub and DockerHub "' @@ -38,11 +40,11 @@ jobs: git clone https://github.com/Websoft9/Stackhub.git sudo docker network create websoft9 && cd Stackhub/appmanage && sudo docker compose up -d ```' > myread.md - + - name: Docker Hub Description uses: peter-evans/dockerhub-description@v3 with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - repository: websoft9dev/appmanage - readme-filepath: appmanage/myread.md + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + repository: websoft9dev/appmanage + readme-filepath: appmanage/myread.md diff --git a/appmanage/Dockerfile b/appmanage/Dockerfile index ef28a3a5..d6cf741e 100644 --- a/appmanage/Dockerfile +++ b/appmanage/Dockerfile @@ -10,7 +10,7 @@ COPY static ./static COPY requirements.txt main.py ./ RUN apt update -# Install supervisord +# Install supervisords RUN apt install -y supervisor COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY config/cmd.sh /cmd.sh diff --git a/docker/w9kopia/.env b/docker/w9kopia/.env index 82dc2788..6c7a0e10 100644 --- a/docker/w9kopia/.env +++ b/docker/w9kopia/.env @@ -2,7 +2,7 @@ POWER_PASSWORD=uQ8E1wVTzG8SOk3! APP_NAME=websoft9-kopia APP_NETWORK=websoft9 -APP_VERSION=latest +APP_VERSION=0.13 APP_HTTP_PORT=51515 APP_USER=admin diff --git a/docker/w9nginxproxymanager/.env b/docker/w9nginxproxymanager/.env index 00a533ef..677613bc 100644 --- a/docker/w9nginxproxymanager/.env +++ b/docker/w9nginxproxymanager/.env @@ -1,6 +1,6 @@ POWER_PASSWORD=changeme APP_NAME=websoft9-nginxproxymanager -APP_VERSION=latest +APP_VERSION=2.10.3 APP_HTTP_PORT=9092 APP_USER=admin@example.com APP_PASSWORD=$POWER_PASSWORD diff --git a/docker/w9portainer/.env b/docker/w9portainer/.env index 034595be..88092205 100644 --- a/docker/w9portainer/.env +++ b/docker/w9portainer/.env @@ -1,4 +1,4 @@ APP_NAME=websoft9-portainer -APP_VERSION=latest +APP_VERSION=2.18.3 APP_HTTP_PORT=9091 APP_NETWORK=websoft9 \ No newline at end of file diff --git a/docker/w9redis/.env b/docker/w9redis/.env index 85bf6962..8b157a4a 100644 --- a/docker/w9redis/.env +++ b/docker/w9redis/.env @@ -1,4 +1,4 @@ -APP_VERSION=latest +APP_VERSION=7.0.11 APP_DB_PORT=6379 APP_NAME=websoft9-redis APP_NETWORK=websoft9