Skip to content

Fix docker image #885

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
asbiin merged 4 commits into from
Feb 8, 2018
Merged

Fix docker image #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a11d98
Don't install nodejs and don't run 'npm install' as it's not needed !
asbiin Feb 5, 2018
850404a
Remove everything that is not usefull
asbiin Feb 5, 2018
037fd5e
Merge branch 'master' into fix-docker-image
asbiin Feb 8, 2018
77c29b3
Fix composer install command
asbiin Feb 8, 2018
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
41 changes: 31 additions & 10 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,35 @@
node_modules/
persist/
public/storage/
resources/vendor/
vendor/
.dockerignore
.env
.git/
.gitattributes
.github/
.gitignore
**/.gitignore
**/.gitkeep
.ci/
.env
CODE_OF_CONDUCT.md
CONTRIBUTING.md
docker-compose.yml
Dockerfile
.dockerignore
docs/
Homestead.json
Homestead.yaml
docker-compose.yml
monica.sublime-workspace
readme.md
node_modules/
npm-debug.log*
persist/
phpunit.xml
Procfile
public/storage/
resources/vendor/
results/
.sass-lint.yml
server.php
sonar-project.properties
steward.yml
.styleci.yml
tests/
travis-sonar.sh
travis-sonar.sh.sig
.travis.yml
.travis.yml.sig
yarn.lock
11 changes: 2 additions & 9 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM alpine:3.6

EXPOSE 80:80

RUN apk update && apk add apache2 curl git make netcat-openbsd nodejs-current-npm openssl php7 php7-apache2 php7-ctype php7-dom php7-fileinfo php7-gd php7-iconv php7-intl php7-json php7-mbstring php7-mysqli php7-openssl php7-pdo_mysql php7-phar php7-session php7-simplexml php7-tokenizer php7-xml php7-xmlreader php7-xmlwriter php7-zip php7-zlib php7-pgsql php7-pdo_pgsql php7-curl
RUN apk update && apk add apache2 curl git make netcat-openbsd openssl php7 php7-apache2 php7-ctype php7-dom php7-fileinfo php7-gd php7-iconv php7-intl php7-json php7-mbstring php7-mysqli php7-openssl php7-pdo_mysql php7-phar php7-session php7-simplexml php7-tokenizer php7-xml php7-xmlreader php7-xmlwriter php7-zip php7-zlib php7-pgsql php7-pdo_pgsql php7-curl

RUN mkdir -p /run/apache2

Expand All @@ -11,13 +11,6 @@ RUN mkdir -p /run/apache2
RUN adduser -D monica && addgroup apache monica
WORKDIR /var/www/monica

# As an optimization, install Node stuff early in the process so that
# it gets cached. That way we don't have to rerun all of this every
# time we change a config file or edit some CSS. Yes, this is ugly,
# but it shaves a few minutes off repeated build times.
ADD package.json .
RUN chown -R monica . && su monica -c "npm install"

# Copy the local (outside Docker) source into the working directory,
# copy system files into their proper homes, and set file ownership
# correctly
Expand All @@ -30,7 +23,7 @@ RUN cp docker/000-default.conf /etc/apache2/conf.d \

# Install composer dependencies and prepare permissions for Apache
USER monica
RUN docker/install-composer.sh && ./composer.phar install
RUN docker/install-composer.sh && ./composer.phar install --no-interaction --prefer-dist --no-suggest --no-dev
USER root

# This is the command that the container will run by default
Expand Down