From 7fa33b205fbc8187cef6deff6b65d528e3821ae1 Mon Sep 17 00:00:00 2001 From: Anthony Ferrara Date: Tue, 16 Apr 2019 13:38:14 -0400 Subject: [PATCH] Build the container properly --- Docker/ubuntu-16.04/Dockerfile | 11 ++--------- Makefile | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Docker/ubuntu-16.04/Dockerfile b/Docker/ubuntu-16.04/Dockerfile index 5f53de0..5f0ed75 100755 --- a/Docker/ubuntu-16.04/Dockerfile +++ b/Docker/ubuntu-16.04/Dockerfile @@ -1,18 +1,11 @@ FROM ircmaxell/php-compiler:16.04-dev -WORKDIR ../ +COPY ./ /compiler -RUN curl -L https://github.com/ircmaxell/php-compiler/archive/master.zip -o master.zip && \ - unzip master.zip && \ - mv php-compiler-master/* compiler/ - -WORKDIR compiler +WORKDIR /compiler RUN php /composer.phar install --no-ansi --no-dev --no-interaction --no-progress --no-scripts --optimize-autoloader -# Needed to initialize PRE -RUN php vendor/autoload.php - ENTRYPOINT ["php", "/compiler/bin/jit.php"] CMD ["-r", "'echo \"Hello World\n\";'"] \ No newline at end of file diff --git a/Makefile b/Makefile index 62cb3f7..4827d81 100755 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ shell: .PHONY: docker-build docker-build: docker build -t ircmaxell/php-compiler:16.04-dev Docker/dev/ubuntu-16.04 - docker build --no-cache -t ircmaxell/php-compiler:16.04 Docker/ubuntu-16.04 + docker build --no-cache -t ircmaxell/php-compiler:16.04 -f Docker/ubuntu-16.04/Dockerfile . .PHONY: benchmark benchmark: rebuild-changed