Skip to content

Commit

Permalink
Docker build is broken #488: updating to Ubunto 22.04, and thus to PH…
Browse files Browse the repository at this point in the history
…P 8.x
  • Loading branch information
pkiraly committed Jun 17, 2024
1 parent 1c2694a commit 541f85e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

LABEL maintainer="Péter Király <[email protected]>, Ákos Takács <[email protected]>, Jakob Voß <[email protected]>"

Expand Down Expand Up @@ -75,11 +75,10 @@ RUN apt-get update \
unzip \
composer \
gettext \
&& locale-gen en_GB.UTF-8 && locale-gen de_DE.UTF-8 && locale-gen pt_BR.UTF-8 \
&& locale-gen en_GB.UTF-8 && locale-gen de_DE.UTF-8 && locale-gen pt_BR.UTF-8 && locale-gen hu_HU.UTF-8 \
&& apt-get --assume-yes autoremove \
&& rm -rf /var/lib/apt/lists/* \
&& cd /var/www/html/ \
# && curl -s -L https://github.com/pkiraly/qa-catalogue-web/archive/${QA_CATALOGUE_VERSION}.zip --output master.zip \
&& if [ "${QA_CATALOGUE_WEB_VERSION}" = "main" ]; then \
curl -s -L https://github.com/pkiraly/qa-catalogue-web/archive/refs/heads/main.zip --output master.zip ; \
elif [ "${QA_CATALOGUE_WEB_VERSION}" = "develop" ]; then \
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Used to start the base image with `docker compose up -d`

version: '2'

services:
app:
image: ${IMAGE:-pkiraly/metadata-qa-marc}
Expand Down
2 changes: 0 additions & 2 deletions docker/build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Used to create the base image with `docker compose build app`

version: '3'

services:
app:
build:
Expand Down

0 comments on commit 541f85e

Please sign in to comment.