Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 0 additions & 106 deletions .github/workflows/build-and-test.yml

This file was deleted.

36 changes: 36 additions & 0 deletions .github/workflows/docker-ops.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
---
name: Docker Ops

"on":
push:
branches:
- "**"
paths:
- ".github/workflows/docker-ops.yml"
- "Dockerfile"
- "bin/**"
- "lib/**"
- "src/**"
- "etc/**"
- "tests/**"
- "Makefile"
- "Makefile.variables"
- "ci/**"
workflow_dispatch:

jobs:
docker-ops:
permissions:
contents: write
security-events: write
id-token: write
uses: udx/reusable-workflows/.github/workflows/docker-ops.yml@master
with:
image_name: usabilitydynamics/udx-worker
docker_login: usabilitydynamics
docker_org: usabilitydynamics
docker_repo: udx-worker
release_branch: latest
version_config_path: ci/git-version.yml
secrets:
docker_token: ${{ secrets.DOCKER_TOKEN }}
160 changes: 0 additions & 160 deletions .github/workflows/release.yml

This file was deleted.

18 changes: 3 additions & 15 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ RUN apt-get update && \
unzip=6.0-28ubuntu7 \
nano=8.4-1 \
vim=2:9.1.0967-1ubuntu6 \
python3.13=3.13.7-1ubuntu0.1 \
python3.13-venv=3.13.7-1ubuntu0.1 \
python3.13=3.13.7-1ubuntu0.3 \
python3.13-venv=3.13.7-1ubuntu0.3 \
python3-pip=25.1.1+dfsg-1ubuntu2 \
supervisor=4.2.5-3 && \
# Install Azure CLI in venv with optimizations for scanning
Expand Down Expand Up @@ -101,18 +101,6 @@ RUN ARCH=$(uname -m) && \
./aws/install && \
rm -rf awscliv2.zip aws /tmp/* /var/tmp/*

# Install Bitwarden CLI (architecture-aware)
RUN ARCH=$(uname -m) && \
if [ "$ARCH" = "x86_64" ]; then \
curl -Lso /usr/local/bin/bw "https://vault.bitwarden.com/download/linux/amd64/bw"; \
elif [ "$ARCH" = "aarch64" ]; then \
curl -Lso /usr/local/bin/bw "https://vault.bitwarden.com/download/linux/arm64/bw"; \
else \
echo "Unsupported architecture: $ARCH" && exit 1; \
fi && \
chmod +x /usr/local/bin/bw && \
rm -rf /tmp/* /var/tmp/*

# Create a new user and group with specific UID and GID, and set permissions
RUN groupadd -g ${GID} ${USER} && \
useradd -l -m -u ${UID} -g ${GID} -s /bin/bash ${USER}
Expand Down Expand Up @@ -212,4 +200,4 @@ USER ${USER}
ENTRYPOINT ["/usr/local/worker/bin/entrypoint.sh"]

# Set the default command
CMD ["tail", "-f", "/dev/null"]
CMD ["tail", "-f", "/dev/null"]
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ clean:
test: clean
@printf "$(COLOR_BLUE)$(SYM_ARROW) Running tests...$(COLOR_RESET)\n"
@$(MAKE) run \
VOLUMES="$(PWD)/src/tests:/home/udx/tests $(PWD)/src/examples/simple-config/.config/worker/worker.yaml:/home/udx/.config/worker/worker.yaml $(PWD)/src/examples/simple-service/.config/worker/services.yaml:/home/udx/.config/worker/services.yaml $(PWD)/src/examples/simple-service/index.sh:/home/udx/index.sh" \
VOLUMES="$(PWD)/src/tests:/home/udx/tests $(PWD)/src/examples/simple-config/.config/worker/worker.yaml:/home/udx/.config/worker/worker.yaml $(PWD)/src/examples/simple-service/.config/worker/services.yaml:/home/udx/.config/worker/services.yaml" \
COMMAND="/home/udx/tests/main.sh"
@printf "$(COLOR_BLUE)$(SYM_ARROW) Following test output...$(COLOR_RESET)\n"
@docker logs -f $(CONTAINER_NAME) & LOGS_PID=$$!; \
Expand All @@ -113,4 +113,4 @@ test: clean
@printf "$(COLOR_GREEN)$(SYM_SUCCESS) Tests completed successfully$(COLOR_RESET)\n"

dev-pipeline: build test
@printf "$(COLOR_GREEN)$(SYM_SUCCESS) Development pipeline completed successfully$(COLOR_RESET)\n"
@printf "$(COLOR_GREEN)$(SYM_SUCCESS) Development pipeline completed successfully$(COLOR_RESET)\n"
Loading