Skip to content

Commit 532d33c

Browse files
authored
Merge pull request #63 from udx/worker-upgrade
Migrate to Docker Ops
2 parents 2e62e60 + be8f9a3 commit 532d33c

9 files changed

Lines changed: 208 additions & 352 deletions

File tree

.github/workflows/build-and-test.yml

Lines changed: 0 additions & 98 deletions
This file was deleted.

.github/workflows/docker-ops.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
name: Docker Operations
3+
4+
"on":
5+
push:
6+
paths:
7+
- ".github/workflows/docker-ops.yml"
8+
- "bin/**"
9+
- "Dockerfile"
10+
- "etc/**"
11+
- "ci/**"
12+
- "src/**"
13+
- LICENSE
14+
workflow_dispatch:
15+
16+
jobs:
17+
docker_ops:
18+
permissions:
19+
id-token: write
20+
contents: write
21+
security-events: write
22+
actions: read
23+
24+
uses: udx/reusable-workflows/.github/workflows/docker-ops.yml@master
25+
with:
26+
image_name: worker-php
27+
release_branch: latest
28+
docker_login: ${{ vars.DOCKER_LOGIN }}
29+
docker_org: ${{ vars.DOCKER_ORG }}
30+
docker_repo: ${{ vars.DOCKER_REPO }}
31+
enable_security_upload: ${{ github.repository == 'udx/worker-php' }}
32+
33+
secrets:
34+
docker_token: ${{ secrets.DOCKER_TOKEN }}

.github/workflows/release.yml

Lines changed: 0 additions & 157 deletions
This file was deleted.

.github/workflows/tests.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
name: Tests
3+
4+
on:
5+
push:
6+
pull_request:
7+
8+
permissions:
9+
contents: read
10+
11+
jobs:
12+
test:
13+
name: Build and Test
14+
runs-on: ubuntu-24.04
15+
16+
steps:
17+
- name: Checkout repository
18+
uses: actions/checkout@v6
19+
20+
- name: Build and test
21+
run: make test

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Use the UDX worker as the base image
2-
FROM usabilitydynamics/udx-worker:0.35.0
2+
FROM usabilitydynamics/udx-worker:0.38.0
33

44
# Add metadata labels
55
LABEL maintainer="UDX"
6-
LABEL version="0.30.0"
6+
LABEL version="0.31.0"
77

88
# Arguments and Environment Variables
99
ARG PHP_VERSION=8.4
10-
ARG PHP_PACKAGE_VERSION=8.4.11-1ubuntu1
11-
ARG NGINX_VERSION=1.28.0-6ubuntu1
10+
ARG PHP_PACKAGE_VERSION=8.4.11-1ubuntu1.1
11+
ARG NGINX_VERSION=1.28.0-6ubuntu1.1
1212

1313
# Set the PHP_VERSION and PHP_PACKAGE_VERSION as environment variables
1414
ENV PHP_VERSION="${PHP_VERSION}"
@@ -28,7 +28,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2828
php"${PHP_VERSION}"-curl="${PHP_PACKAGE_VERSION}" \
2929
php"${PHP_VERSION}"-xml="${PHP_PACKAGE_VERSION}" \
3030
php"${PHP_VERSION}"-zip="${PHP_PACKAGE_VERSION}" \
31-
mysql-client=8.4.7-0ubuntu0.25.10.2 && \
31+
mysql-client=8.4.8-0ubuntu0.25.10.1 && \
3232
apt-get clean && \
3333
rm -rf /tmp/* /var/tmp/* && \
3434
mkdir -p /etc/apt/sources.list.d && \

0 commit comments

Comments
 (0)