Skip to content

Commit

Permalink
Run prod docker with mysql 8.0.32 and php 8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ddave001 committed Feb 3, 2023
1 parent 2b47f5f commit 8d5f208
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.17.1
LABEL Maintainer="Thilina, Pituwala <[email protected]>" \
Description="IceHrm Docker Container with Nginx 1.16 & PHP-FPM 7.3 based on Alpine Linux."
Description="IceHrm Docker Container with Nginx & PHP-FPM based on Alpine Linux."

ENV PHPIZE_DEPS \
autoconf \
Expand Down
16 changes: 8 additions & 8 deletions Dockerfile-prod
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
FROM alpine:3.11
FROM alpine:3.17.1
LABEL Maintainer="Thilina, Pituwala <[email protected]>" \
Description="IceHrm Docker Container with Nginx 1.16 & PHP-FPM 7.3 based on Alpine Linux."
Description="IceHrm Docker Container with Nginx & PHP-FPM based on Alpine Linux."

# Install packages
RUN apk --no-cache add php7 php7-fpm php7-opcache php7-mysqli php7-json php7-openssl php7-curl \
php7-zlib php7-xml php7-phar php7-intl php7-dom php7-xmlreader php7-ctype php7-session \
php7-mbstring php7-gd php7-ldap nginx supervisor curl
RUN apk --no-cache add php php-fpm php-opcache php-mysqli php-json php-openssl php-curl \
php-zlib php-xml php-phar php-intl php-dom php-xmlreader php-ctype php-session \
php-mbstring php-gd nginx supervisor curl

# Configure nginx
COPY docker/prod/config/nginx.conf /etc/nginx/nginx.conf
# Remove default server definition
RUN rm /etc/nginx/conf.d/default.conf
#RUN rm /etc/nginx/conf.d/default.conf

# Configure PHP-FPM
COPY docker/prod/config/fpm-pool.conf /etc/php7/php-fpm.d/www.conf
COPY docker/prod/config/php.ini /etc/php7/conf.d/custom.ini
COPY docker/prod/config/fpm-pool.conf /etc/php81/php-fpm.d/www.conf
COPY docker/prod/config/php.ini /etc/php81/conf.d/custom.ini

# Configure supervisord
COPY docker/prod/config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 9 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
"directories": {
"test": "test"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
"license": "ISC",
"devDependencies": {
Expand Down Expand Up @@ -55,5 +52,14 @@
"gulp-javascript-obfuscator": "^1.1.6",
"qrcode": "^1.3.3",
"reqwest": "^2.0.5"
},
"scripts": {
"setup": "npm install && cd web && npm install && cd ..",
"docker:build": "docker compose -f docker-compose-prod.yaml build",
"docker:start": "docker compose -f docker-compose-prod.yaml up",
"docker:start:bg": "docker compose -f docker-compose-prod.yaml up -d",
"docker:stop": "docker compose -f docker-compose-prod.yaml down",
"asset:build": "gulp",
"asset:build:prod": "gulp --eprod"
}
}

0 comments on commit 8d5f208

Please sign in to comment.