diff --git a/.github/workflows/build_git.yml b/.github/workflows/build_git.yml index 026097e3..129a7cd2 100644 --- a/.github/workflows/build_git.yml +++ b/.github/workflows/build_git.yml @@ -26,7 +26,7 @@ jobs: - uses: mr-smithers-excellent/docker-build-push@v5 name: Build & push Docker image with: - image: websoft9dev/gitea + image: websoft9dev/git tags: ${{ env.VERSION }} addLatest: True registry: docker.io diff --git a/docker/w9deployment/docker-compose.yml b/docker/w9deployment/docker-compose.yml index 463e3ff0..25768cca 100644 --- a/docker/w9deployment/docker-compose.yml +++ b/docker/w9deployment/docker-compose.yml @@ -11,7 +11,7 @@ services: ports: - 9001-9999:9000 volumes: - - portainer:/data + - deployment:/data - /var/run/docker.sock:/var/run/docker.sock labels: com.docker.compose.w9_http.port: 9000 @@ -22,4 +22,4 @@ networks: external: true volumes: - portainer: \ No newline at end of file + deployment: \ No newline at end of file diff --git a/docker/w9git/Dockerfile b/docker/w9git/Dockerfile index b0b4e596..f51d9521 100644 --- a/docker/w9git/Dockerfile +++ b/docker/w9git/Dockerfile @@ -2,6 +2,5 @@ FROM gitea/gitea:1.20.4 LABEL maintainer="Websoft9" LABEL version="1.20.4" - COPY ./src/s6/user /etc/s6/user RUN chmod -R 755 /etc/s6/user \ No newline at end of file diff --git a/docker/w9git/docker-compose.yml b/docker/w9git/docker-compose.yml index f02531a3..39d7393a 100644 --- a/docker/w9git/docker-compose.yml +++ b/docker/w9git/docker-compose.yml @@ -5,14 +5,14 @@ version: '3.8' services: - gitea: + git: container_name: $APP_NAME - image: websoft9dev/gitea:$APP_VERSION + image: websoft9dev/git:$APP_VERSION restart: always env_file: - .env volumes: - - gitea:/data + - git:/data - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro ports: @@ -26,4 +26,4 @@ networks: external: true volumes: - gitea: \ No newline at end of file + git: \ No newline at end of file