From 3d09704400d28ff3408e6f24b772fd24f27fca4c Mon Sep 17 00:00:00 2001
From: Andrew <mykge@outlook.com>
Date: Mon, 29 Jul 2024 17:30:41 +0800
Subject: [PATCH 1/6] Update Dockerfile
add ffmpeg
---
3.9/slim-bullseye/Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/3.9/slim-bullseye/Dockerfile b/3.9/slim-bullseye/Dockerfile
index 5e6517b00..b8413ad2c 100644
--- a/3.9/slim-bullseye/Dockerfile
+++ b/3.9/slim-bullseye/Dockerfile
@@ -52,7 +52,8 @@ RUN set -eux; \
uuid-dev \
wget \
xz-utils \
- zlib1g-dev \
+ zlib1g-dev \
+ ffmpeg \
; \
\
wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz"; \
From 91474a3a75648e9d8364bf306828313f8f466986 Mon Sep 17 00:00:00 2001
From: Andrew <mykge@outlook.com>
Date: Mon, 29 Jul 2024 17:40:34 +0800
Subject: [PATCH 2/6] Create main.yml
---
.github/workflows/main.yml | 50 ++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
create mode 100644 .github/workflows/main.yml
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 000000000..0e5303a90
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,50 @@
+name: Build-Dev
+
+on:
+ workflow_dispatch: # 使用 workflow_dispatch 事件触发
+ # pull_request:
+ # branches: [ "main" ]
+ # push:
+ # branches: [ "main" ]
+
+jobs:
+
+ build:
+
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+
+ - name: Docker Login
+ # You may pin to the exact commit or the version.
+ # uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
+ uses: docker/login-action@v3.3.0
+ with:
+ # Username used to log against the Docker registry
+ username: ${{ secrets.DOCKERHUB_USER }}
+ # Password or personal access token used to log against the Docker registry
+ password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+ - name: FetchTimestamp
+ id: timestamp
+ run: echo "TIMESTAMP=$(date '+%y%m%d')" >> $GITHUB_ENV
+
+ - name: FetchGitHash
+ id: git-hash
+ run: echo "GIT_HASH=$(git rev-parse HEAD | cut -c1-4)" >> $GITHUB_ENV
+
+ - name: SetEnvVar
+ run: |
+ echo "IMAGE_VERSION=${{ env.TIMESTAMP }}-${{ env.GIT_HASH }}" >> $GITHUB_ENV
+ echo "IMAGE_TAG=webnuxt-dev-${{ env.TIMESTAMP }}-${{ env.GIT_HASH }}" >> $GITHUB_ENV
+
+ - name: ECHO IMAGE_TAG
+ run: echo $IMAGE_TAG
+
+ - name: BuildDockerImage
+ run: cd ./3.9/slim-bullseye && docker build -t standardcore/python-ffmpeg:slim-${{ env.IMAGE_TAG }} .
+
+ - name: PushDockerImage
+ run: docker push standardcore/python-ffmpeg:slim-${{ env.IMAGE_TAG }} .
From bb160746f7ae1afd6e362b00c5bf02a12a2d82cf Mon Sep 17 00:00:00 2001
From: Andrew <mykge@outlook.com>
Date: Mon, 29 Jul 2024 17:43:21 +0800
Subject: [PATCH 3/6] Delete .github/workflows/ci.yml
---
.github/workflows/ci.yml | 72 ----------------------------------------
1 file changed, 72 deletions(-)
delete mode 100644 .github/workflows/ci.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
deleted file mode 100644
index de3a60907..000000000
--- a/.github/workflows/ci.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-name: GitHub CI
-
-on:
- pull_request:
- push:
- workflow_dispatch:
- schedule:
- - cron: 0 0 * * 0
-
-defaults:
- run:
- shell: 'bash -Eeuo pipefail -x {0}'
-
-concurrency:
- group: ${{ github.ref }}
- cancel-in-progress: true
-
-jobs:
-
- generate-jobs:
- name: Generate Jobs
- runs-on: ubuntu-latest
- outputs:
- strategy: ${{ steps.generate-jobs.outputs.strategy }}
- steps:
- - uses: actions/checkout@v4
- - uses: docker-library/bashbrew@HEAD
- - id: generate-jobs
- name: Generate Jobs
- run: |
- strategy="$("$BASHBREW_SCRIPTS/github-actions/generate.sh")"
-
- # https://github.com/docker-library/python/pull/706 (ensure we don't have any unexpected ".a" leftovers in "/usr/local")
- strategy="$(jq <<<"$strategy" -c '
- .matrix.include |= map(
- if .os == "ubuntu-latest" then
- .runs.test += "\n" + (
- .meta.entries
- | map(
- .tags[0]
- | "aFiles=\"$(docker run --rm \(. | @sh) find /usr/local -name \"*.a\" | tee /dev/stderr)\"; [ -z \"$aFiles\" ]"
- )
- | join("\n")
- )
- else . end
- )
- ')"
-
- EOF="EOF-$RANDOM-$RANDOM-$RANDOM"
- echo "strategy<<$EOF" >> "$GITHUB_OUTPUT"
- jq <<<"$strategy" . | tee -a "$GITHUB_OUTPUT"
- echo "$EOF" >> "$GITHUB_OUTPUT"
-
- test:
- needs: generate-jobs
- strategy: ${{ fromJson(needs.generate-jobs.outputs.strategy) }}
- name: ${{ matrix.name }}
- runs-on: ${{ matrix.os }}
- steps:
- - uses: actions/checkout@v4
- - name: Prepare Environment
- run: ${{ matrix.runs.prepare }}
- - name: Pull Dependencies
- run: ${{ matrix.runs.pull }}
- - name: Build ${{ matrix.name }}
- run: ${{ matrix.runs.build }}
- - name: History ${{ matrix.name }}
- run: ${{ matrix.runs.history }}
- - name: Test ${{ matrix.name }}
- run: ${{ matrix.runs.test }}
- - name: '"docker images"'
- run: ${{ matrix.runs.images }}
From 5ce9e664780f5037bd0d5b51ac4b4323f524b6ab Mon Sep 17 00:00:00 2001
From: Andrew <mykge@outlook.com>
Date: Mon, 29 Jul 2024 17:43:31 +0800
Subject: [PATCH 4/6] Delete .github/workflows/verify-templating.yml
---
.github/workflows/verify-templating.yml | 22 ----------------------
1 file changed, 22 deletions(-)
delete mode 100644 .github/workflows/verify-templating.yml
diff --git a/.github/workflows/verify-templating.yml b/.github/workflows/verify-templating.yml
deleted file mode 100644
index 2e1fb7872..000000000
--- a/.github/workflows/verify-templating.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Verify Templating
-
-on:
- pull_request:
- push:
-
-defaults:
- run:
- shell: 'bash -Eeuo pipefail -x {0}'
-
-jobs:
- apply-templates:
- name: Check For Uncomitted Changes
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v4
- - name: Apply Templates
- run: ./apply-templates.sh
- - name: Check Git Status
- run: |
- status="$(git status --short)"
- [ -z "$status" ]
From a974c7012985e28acaa56ae53c6e344b1013dcd1 Mon Sep 17 00:00:00 2001
From: Andrew <mykge@outlook.com>
Date: Mon, 29 Jul 2024 17:48:59 +0800
Subject: [PATCH 5/6] Update main.yml
---
.github/workflows/main.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0e5303a90..88fc8554b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -38,13 +38,13 @@ jobs:
- name: SetEnvVar
run: |
echo "IMAGE_VERSION=${{ env.TIMESTAMP }}-${{ env.GIT_HASH }}" >> $GITHUB_ENV
- echo "IMAGE_TAG=webnuxt-dev-${{ env.TIMESTAMP }}-${{ env.GIT_HASH }}" >> $GITHUB_ENV
+ echo "IMAGE_TAG=slim-${{ env.TIMESTAMP }}-${{ env.GIT_HASH }}" >> $GITHUB_ENV
- name: ECHO IMAGE_TAG
run: echo $IMAGE_TAG
- name: BuildDockerImage
- run: cd ./3.9/slim-bullseye && docker build -t standardcore/python-ffmpeg:slim-${{ env.IMAGE_TAG }} .
+ run: cd ./3.9/slim-bullseye && docker build -t standardcore/python-ffmpeg:${{ env.IMAGE_TAG }} .
- name: PushDockerImage
- run: docker push standardcore/python-ffmpeg:slim-${{ env.IMAGE_TAG }} .
+ run: docker push standardcore/python-ffmpeg:${{ env.IMAGE_TAG }} .
From ca652929f1aa2725fcf6b4be9bd23deabbed0376 Mon Sep 17 00:00:00 2001
From: Andrew <mykge@outlook.com>
Date: Tue, 30 Jul 2024 10:44:43 +0800
Subject: [PATCH 6/6] Update main.yml
---
.github/workflows/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 88fc8554b..5448d2edd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -47,4 +47,4 @@ jobs:
run: cd ./3.9/slim-bullseye && docker build -t standardcore/python-ffmpeg:${{ env.IMAGE_TAG }} .
- name: PushDockerImage
- run: docker push standardcore/python-ffmpeg:${{ env.IMAGE_TAG }} .
+ run: docker push standardcore/python-ffmpeg:${{ env.IMAGE_TAG }}