Compare commits
No commits in common. "ee60e71cf229a694b3a92b2f5b529bc80e13f450" and "f2f0227666d3818e8f6a5f241bbae852f18b61b6" have entirely different histories.
ee60e71cf2
...
f2f0227666
4 changed files with 4 additions and 123 deletions
13
.github/workflows/clean_repository.yml
vendored
13
.github/workflows/clean_repository.yml
vendored
|
@ -3,17 +3,6 @@ on:
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '45 11 * * 0'
|
- cron: '45 11 * * 0'
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
|
||||||
days:
|
|
||||||
description: 'retain days'
|
|
||||||
required: true
|
|
||||||
default: 15
|
|
||||||
type: choice
|
|
||||||
options:
|
|
||||||
- 1
|
|
||||||
- 2
|
|
||||||
- 7
|
|
||||||
- 15
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
del_runs:
|
del_runs:
|
||||||
|
@ -27,5 +16,5 @@ jobs:
|
||||||
with:
|
with:
|
||||||
token: ${{ github.token }}
|
token: ${{ github.token }}
|
||||||
repository: ${{ github.repository }}
|
repository: ${{ github.repository }}
|
||||||
retain_days: ${{ github.event.inputs.days }}
|
retain_days: 30
|
||||||
keep_minimum_runs: 7
|
keep_minimum_runs: 7
|
||||||
|
|
70
.github/workflows/release_branch.yml
vendored
70
.github/workflows/release_branch.yml
vendored
|
@ -1,70 +0,0 @@
|
||||||
name: Build and push image from branch
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
env:
|
|
||||||
DOTCLEAR_IMAGE: docker-dotclear
|
|
||||||
DOCKER_NAMESPACE: jcpd
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build_image:
|
|
||||||
if: (github.ref_name != 'master')
|
|
||||||
name: Build and push selected version images
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
permissions:
|
|
||||||
packages: write
|
|
||||||
contents: read
|
|
||||||
attestations: write
|
|
||||||
id-token: write
|
|
||||||
steps:
|
|
||||||
- name: Check out the repo
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
ref: ${{ github.ref_name }}
|
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
|
|
||||||
- name: Login to Docker Hub
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
username: ${{ secrets.DOCKER_USERNAME }}
|
|
||||||
password: ${{ secrets.DOCKER_TOKEN }}
|
|
||||||
|
|
||||||
- name: Log in to Github registry
|
|
||||||
uses: docker/login-action@v3
|
|
||||||
with:
|
|
||||||
registry: ghcr.io
|
|
||||||
username: ${{ github.actor }}
|
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
|
|
||||||
- name: set lower case github repository
|
|
||||||
run: |
|
|
||||||
echo "GITHUB_REPOSITORY=${REPO,,}" >>${GITHUB_ENV}
|
|
||||||
env:
|
|
||||||
REPO: '${{ github.repository }}'
|
|
||||||
|
|
||||||
- name: Build and push images
|
|
||||||
uses: docker/build-push-action@v6
|
|
||||||
with:
|
|
||||||
context: .
|
|
||||||
sbom: true
|
|
||||||
push: true
|
|
||||||
tags: |
|
|
||||||
${{ env.DOCKER_NAMESPACE }}/${{ env.DOTCLEAR_IMAGE }}:${{ github.ref_name }}
|
|
||||||
ghcr.io/${{ env.GITHUB_REPOSITORY }}:${{ github.ref_name }}
|
|
||||||
build-args: CANAL=stable
|
|
||||||
platforms: linux/386,linux/amd64,linux/arm64,linux/arm/V7
|
|
||||||
cache-from: type=gha
|
|
||||||
cache-to: type=gha,mode=max
|
|
||||||
|
|
||||||
- name: Send Telegram Message Ok
|
|
||||||
uses: appleboy/telegram-action@master
|
|
||||||
env:
|
|
||||||
GITHUB_CONTEXT: ${{toJSON(github)}}
|
|
||||||
with:
|
|
||||||
to: ${{ secrets.TELEGRAM_ID }}
|
|
||||||
token: ${{ secrets.TELEGRAM_TOKEN }}
|
|
||||||
format: markdown
|
|
||||||
message: Image __${{ env.DOTCLEAR_IMAGE }}:${{ github.ref_name }}__ successfully generated.
|
|
42
.github/workflows/release_stable.yml
vendored
42
.github/workflows/release_stable.yml
vendored
|
@ -24,8 +24,7 @@ jobs:
|
||||||
contents: read
|
contents: read
|
||||||
outputs:
|
outputs:
|
||||||
version: ${{ steps.dotclear.outputs.version }}
|
version: ${{ steps.dotclear.outputs.version }}
|
||||||
has_image: ${{ steps.registry.outputs.image_exists }}
|
exists: ${{ steps.registry.outputs.image_exists }}
|
||||||
has_branch: ${{ steps.branch.outputs.exists }}
|
|
||||||
steps:
|
steps:
|
||||||
- name: Download and parse last version
|
- name: Download and parse last version
|
||||||
id: dotclear
|
id: dotclear
|
||||||
|
@ -44,12 +43,6 @@ jobs:
|
||||||
dockerhub_username: ${{ secrets.DOCKER_USERNAME }}
|
dockerhub_username: ${{ secrets.DOCKER_USERNAME }}
|
||||||
dockerhub_token: ${{ secrets.DOCKER_TOKEN }}
|
dockerhub_token: ${{ secrets.DOCKER_TOKEN }}
|
||||||
|
|
||||||
- name: Check repository branch
|
|
||||||
id: branch
|
|
||||||
uses: GuillaumeFalourd/branch-exists@v1.1
|
|
||||||
with:
|
|
||||||
branch: ${{ steps.dotclear.outputs.version }}
|
|
||||||
|
|
||||||
- name: notfound
|
- name: notfound
|
||||||
if: (steps.registry.outputs.image_exists == 'false')
|
if: (steps.registry.outputs.image_exists == 'false')
|
||||||
run: |
|
run: |
|
||||||
|
@ -62,40 +55,9 @@ jobs:
|
||||||
SUMMARY=$'Image ${{ env.DOCKER_NAMESPACE }}/${{ env.DOTCLEAR_IMAGE }}:${{ steps.dotclear.outputs.version }} found.'
|
SUMMARY=$'Image ${{ env.DOCKER_NAMESPACE }}/${{ env.DOTCLEAR_IMAGE }}:${{ steps.dotclear.outputs.version }} found.'
|
||||||
echo "$SUMMARY" >> $GITHUB_STEP_SUMMARY
|
echo "$SUMMARY" >> $GITHUB_STEP_SUMMARY
|
||||||
|
|
||||||
do_branch:
|
|
||||||
needs: check_image
|
|
||||||
if: ((needs.check_image.outputs.has_branch == 'false') || (github.event.inputs.force_rebuild == 'true'))
|
|
||||||
name: Create repository branch
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
steps:
|
|
||||||
- name: Check out the repo
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Create repository branch
|
|
||||||
id: create
|
|
||||||
uses: peterjgrainger/action-create-branch@v2.2.0
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
with:
|
|
||||||
branch: ${{ needs.check_image.outputs.version }}
|
|
||||||
|
|
||||||
- name: notfound
|
|
||||||
if: (steps.create.outputs.created == 'false')
|
|
||||||
run: |
|
|
||||||
SUMMARY=$'Branch ${{ needs.check_image.outputs.version }} has not been created.'
|
|
||||||
echo "$SUMMARY" >> $GITHUB_STEP_SUMMARY
|
|
||||||
|
|
||||||
- name: found
|
|
||||||
if: (steps.create.outputs.created == 'true')
|
|
||||||
run: |
|
|
||||||
SUMMARY=$' Branch ${{ needs.check_image.outputs.version }} has been created.'
|
|
||||||
echo "$SUMMARY" >> $GITHUB_STEP_SUMMARY
|
|
||||||
|
|
||||||
do_image:
|
do_image:
|
||||||
needs: check_image
|
needs: check_image
|
||||||
if: ((needs.check_image.outputs.has_image == 'false') || (github.event.inputs.force_rebuild == 'true'))
|
if: ((needs.check_image.outputs.exists == 'false') || (github.event.inputs.force_rebuild == 'true'))
|
||||||
name: Build and push latest and versionned images
|
name: Build and push latest and versionned images
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
permissions:
|
permissions:
|
||||||
|
|
|
@ -136,7 +136,7 @@ RUN curl -fsSL -o plugin.zip "https://github.com/JcDenis/dcLog/releases/download
|
||||||
&& rm plugin.zip
|
&& rm plugin.zip
|
||||||
|
|
||||||
# sysInfo
|
# sysInfo
|
||||||
ENV VER_SI=9.8
|
ENV VER_SI=9.7
|
||||||
RUN curl -fsSL -o plugin.zip "https://github.com/franck-paul/sysInfo/releases/download/$VER_SI/plugin-sysInfo-$VER_SI.zip" \
|
RUN curl -fsSL -o plugin.zip "https://github.com/franck-paul/sysInfo/releases/download/$VER_SI/plugin-sysInfo-$VER_SI.zip" \
|
||||||
&& mkdir -p /var/lib/dotclear/plugins/sysInfo \
|
&& mkdir -p /var/lib/dotclear/plugins/sysInfo \
|
||||||
&& unzip -d /var/lib/dotclear/plugins plugin.zip \
|
&& unzip -d /var/lib/dotclear/plugins plugin.zip \
|
||||||
|
|
Loading…
Reference in a new issue