git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WIP tests on Docker
[plcapi.git]
/
tests
/
ci
/
Dockerfile
diff --git
a/tests/ci/Dockerfile
b/tests/ci/Dockerfile
index
a604020
..
7fb27de
100644
(file)
--- a/
tests/ci/Dockerfile
+++ b/
tests/ci/Dockerfile
@@
-4,20
+4,19
@@
FROM ubuntu:${UBUNTU_VERSION}
ARG PHP_VERSION=default
ARG PHP_VERSION=default
-RUN mkdir -p /usr/share/man/man1 && \
- apt-get update
-
COPY setup/*.sh /root/setup/
COPY config/* /root/config/
COPY setup/*.sh /root/setup/
COPY config/* /root/config/
-RUN chmod 755 /root/setup/*.sh && \
+RUN mkdir -p /usr/share/man/man1 && \
+ apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y upgrade && \
+ chmod 755 /root/setup/*.sh && \
cd /root/setup && \
./install_packages.sh && \
./create_user.sh && \
./setup_apache.sh && \
./setup_privoxy.sh && \
./setup_php.sh "${PHP_VERSION}" && \
cd /root/setup && \
./install_packages.sh && \
./create_user.sh && \
./setup_apache.sh && \
./setup_privoxy.sh && \
./setup_php.sh "${PHP_VERSION}" && \
- apt-get remove -y composer || echo An error on the line above is ok; ./get_composer.sh && mv /usr/local/bin/composer.phar /usr/local/bin/composer && chmod 755 /usr/local/bin/composer
+ ./setup_composer.sh
COPY docker/entrypoint.sh /root/entrypoint.sh
RUN chmod 755 /root/entrypoint.sh
COPY docker/entrypoint.sh /root/entrypoint.sh
RUN chmod 755 /root/entrypoint.sh