This commit is contained in:
qiaofeng1227 2023-09-20 08:47:52 +08:00
parent b780e6d46b
commit d696053ee9
4 changed files with 12 additions and 13 deletions

View File

@ -4,7 +4,7 @@ on:
push: push:
branches: [main] branches: [main]
paths: paths:
- "docker/w9apphub/Dockerfile" - "docker/apphub/Dockerfile"
jobs: jobs:
build: build:
@ -18,7 +18,7 @@ jobs:
- name: Get version - name: Get version
run: | run: |
version=$(grep -Po '(?<=LABEL version=").*?(?=")' docker/w9apphub/Dockerfile) version=$(grep -Po '(?<=LABEL version=").*?(?=")' docker/apphub/Dockerfile)
echo $version echo $version
echo "::set-output name=version::$version" echo "::set-output name=version::$version"
echo "VERSION=$version" >> $GITHUB_ENV echo "VERSION=$version" >> $GITHUB_ENV
@ -30,8 +30,8 @@ jobs:
tags: ${{ env.VERSION }} tags: ${{ env.VERSION }}
addLatest: True addLatest: True
registry: docker.io registry: docker.io
dockerfile: docker/w9apphub/Dockerfile dockerfile: docker/apphub/Dockerfile
directory: docker/w9apphub directory: docker/apphub
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}

View File

@ -4,7 +4,7 @@ on:
push: push:
branches: [main] branches: [main]
paths: paths:
- "docker/w9deployment/Dockerfile" - "docker/deployment/Dockerfile"
jobs: jobs:
build: build:
@ -18,7 +18,7 @@ jobs:
- name: Get version - name: Get version
run: | run: |
version=$(grep -Po '(?<=LABEL version=").*?(?=")' docker/w9deployment/Dockerfile) version=$(grep -Po '(?<=LABEL version=").*?(?=")' docker/deployment/Dockerfile)
echo $version echo $version
echo "::set-output name=version::$version" echo "::set-output name=version::$version"
echo "VERSION=$version" >> $GITHUB_ENV echo "VERSION=$version" >> $GITHUB_ENV
@ -30,7 +30,7 @@ jobs:
tags: ${{ env.VERSION }} tags: ${{ env.VERSION }}
addLatest: True addLatest: True
registry: docker.io registry: docker.io
dockerfile: docker/w9deployment/Dockerfile dockerfile: docker/deployment/Dockerfile
directory: docker/w9deployment directory: docker/deployment
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}

View File

@ -4,7 +4,7 @@ on:
push: push:
branches: [main] branches: [main]
paths: paths:
- "docker/w9git/Dockerfile" - "docker/git/Dockerfile"
jobs: jobs:
build: build:
@ -18,7 +18,7 @@ jobs:
- name: Get version - name: Get version
run: | run: |
version=$(grep -Po '(?<=LABEL version=").*?(?=")' docker/w9git/Dockerfile) version=$(grep -Po '(?<=LABEL version=").*?(?=")' docker/git/Dockerfile)
echo $version echo $version
echo "::set-output name=version::$version" echo "::set-output name=version::$version"
echo "VERSION=$version" >> $GITHUB_ENV echo "VERSION=$version" >> $GITHUB_ENV
@ -30,7 +30,7 @@ jobs:
tags: ${{ env.VERSION }} tags: ${{ env.VERSION }}
addLatest: True addLatest: True
registry: docker.io registry: docker.io
dockerfile: docker/w9git/Dockerfile dockerfile: docker/git/Dockerfile
directory: docker/w9git directory: docker/git
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}

View File

@ -32,7 +32,6 @@ RUN pip install --upgrade pip && pip install -r apphub/requirements.txt
RUN pip install supervisor RUN pip install supervisor
COPY config/supervisord.conf /usr/local/supervisord.conf COPY config/supervisord.conf /usr/local/supervisord.conf
RUN chmod +r /usr/local/supervisord.conf RUN chmod +r /usr/local/supervisord.conf
COPY config/entrypoint.sh /entrypoint.sh COPY config/entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh RUN chmod +x /entrypoint.sh