diff --git a/podman-framadate/ci_build_images.sh b/podman-framadate/ci_build_images.sh index 2422eaf..2b9ea0d 100755 --- a/podman-framadate/ci_build_images.sh +++ b/podman-framadate/ci_build_images.sh @@ -8,7 +8,7 @@ ensure_pwd_is_scriptdir ensure_not_root if ! podman image exists ${framadate_image}:${framadate_version}; then - podman build -t "${framadate_image}":"${framadate_version}" --build-arg=version="${framadate_release}" --file docker/Dockerfile + podman build -t "${framadate_image}":"${framadate_version}" --build-arg=version="${framadate_release}" docker/ else echo "Image ${framadate_image}:${framadate_version} already built" fi diff --git a/podman-framadate/docker/Dockerfile b/podman-framadate/docker/Dockerfile index cc9ee1e..5e13a50 100644 --- a/podman-framadate/docker/Dockerfile +++ b/podman-framadate/docker/Dockerfile @@ -9,9 +9,9 @@ RUN a2enmod rewrite COPY --from=docker.io/library/composer:2.2 /usr/bin/composer /usr/bin/composer -COPY docker/php.ini /usr/local/etc/php/php.ini -COPY docker/apache-framadate.conf /etc/apache2/sites-enabled/framadate.conf -COPY docker/entrypoint.sh /usr/local/bin/entrypoint +COPY php.ini /usr/local/etc/php/php.ini +COPY apache-framadate.conf /etc/apache2/sites-enabled/framadate.conf +COPY entrypoint.sh /usr/local/bin/entrypoint ENV COMPOSER_ALLOW_SUPERUSER=1 RUN set -eux; \