Skip to content

Fix gitlabci build again #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 26, 2024
Merged

Fix gitlabci build again #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80440c6
Trigger on PRs
vmcj Aug 2, 2024
c2a6f8b
Create the user before installing the tools as that user
vmcj Aug 26, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/build-contributor-container-PR.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ name: 'Build Contributor container (PR)'
on:
push:
paths:
- docker-contributor
- docker-contributor/**
- .github/workflows/build-contributor-container-PR.yml
pull_request:
branches:
- main
paths:
- docker-contributor
- docker-contributor/**
- .github/workflows/build-contributor-container-PR.yml

jobs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-domjudge-container-PR.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ on:
push:
paths:
- .github/workflows/build-domjudge-container-PR.yml
- docker
- docker/**
pull_request:
branches:
- main
paths:
- .github/workflows/build-domjudge-container-PR.yml
- docker
- docker/**

env:
DOMJUDGE_VERSION: M.m.p
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-gitlab-container-PR.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ on:
push:
paths:
- docker-contributor/php-config
- docker-gitlabci
- docker-gitlabci/**
- .github/workflows/build-gitlab-container-PR.yml
pull_request:
branches:
- main
paths:
- docker-contributor/php-config
- docker-gitlabci
- docker-gitlabci/**
- .github/workflows/build-gitlab-container-PR.yml

jobs:
Expand Down
15 changes: 8 additions & 7 deletions docker-gitlabci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ FROM ubuntu:24.04
ENV DEBIAN_FRONTEND=noninteractive
ENV PHPSUPPORTED="7.4 8.0 8.1 8.2"
ENV APTINSTALL="apt-get install -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confold"
RUN useradd -m domjudge
RUN useradd -d /nonexistent -g nogroup -s /bin/false domjudge-run-0
RUN useradd -d /nonexistent -g nogroup -s /bin/false domjudge-run-1
RUN groupadd domjudge-run

RUN apt-get update && apt-get install -y \
acl make zip unzip apache2-utils bsdmainutils libcurl4-gnutls-dev \
libjsoncpp-dev libmagic-dev autoconf automake bats sudo debootstrap procps \
Expand All @@ -25,9 +30,10 @@ RUN apt-get update && apt-get install -y \
&& rm -rf /var/lib/apt/lists/*

# Install needed NPM packages and download chrome for the domjudge user
RUN su domjudge -c "npm install pa11y puppeteer && \
RUN su domjudge -c "cd /home/domjudge && \
npm install pa11y puppeteer && \
npx puppeteer browsers install chrome && \
npm cache clean"
npm cache clean --force"

# Install needed global PHP modules
RUN composer -n require justinrainbow/json-schema
Expand All @@ -46,11 +52,6 @@ RUN add-apt-repository ppa:ondrej/php -y && apt-get update && \
# Put the gitlab user in sudo
RUN echo 'ALL ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers

RUN useradd -m domjudge
RUN useradd -d /nonexistent -g nogroup -s /bin/false domjudge-run-0
RUN useradd -d /nonexistent -g nogroup -s /bin/false domjudge-run-1
RUN groupadd domjudge-run

# Update dictionary to latest version
ENV GITHUBDICTIONARY="https://raw.githubusercontent.com/codespell-project/codespell/master/codespell_lib/data/dictionary.txt"
ENV CODESPELLDICTLOCATION="/usr/lib/python3/dist-packages/codespell_lib/data/dictionary.txt"
Expand Down
Loading