Skip to content

Upgraded the OS level #15

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.

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM alpine:edge
MAINTAINER Paul Smith <pa.ulsmith.net>
FROM alpine:3.14
LABEL maintainer="Ivelin Vasilev <ivasgo@gmail.com>"

# Add repos
RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
#RUN echo "https://dl-cdn.alpinelinux.org/alpine/edge/releases/" >> /etc/apk/repositories

# Add basics first
RUN apk update && apk upgrade && apk add \
bash apache2 php7-apache2 curl ca-certificates openssl openssh git php7 php7-phar php7-json php7-iconv php7-openssl tzdata openntpd nano
RUN apk update && apk upgrade && apk add bash apache2 php7-apache2 curl ca-certificates \
openssl openssh git php7 php7-phar php7-json php7-iconv php7-openssl tzdata openntpd nano

# Add Composer
RUN curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/local/bin/composer
Expand Down Expand Up @@ -48,14 +48,14 @@ RUN apk add \
php7-fileinfo \
php7-ldap \
php7-apcu

# Problems installing in above stack
#
## Problems installing in above stack
RUN apk add php7-simplexml

#
RUN cp /usr/bin/php7 /usr/bin/php \
&& rm -f /var/cache/apk/*

# Add apache to run and configure
#
## Add apache to run and configure
RUN sed -i "s/#LoadModule\ rewrite_module/LoadModule\ rewrite_module/" /etc/apache2/httpd.conf \
&& sed -i "s/#LoadModule\ session_module/LoadModule\ session_module/" /etc/apache2/httpd.conf \
&& sed -i "s/#LoadModule\ session_cookie_module/LoadModule\ session_cookie_module/" /etc/apache2/httpd.conf \
Expand All @@ -64,10 +64,10 @@ RUN sed -i "s/#LoadModule\ rewrite_module/LoadModule\ rewrite_module/" /etc/apac
&& sed -i "s#^DocumentRoot \".*#DocumentRoot \"/app/public\"#g" /etc/apache2/httpd.conf \
&& sed -i "s#/var/www/localhost/htdocs#/app/public#" /etc/apache2/httpd.conf \
&& printf "\n<Directory \"/app/public\">\n\tAllowOverride All\n</Directory>\n" >> /etc/apache2/httpd.conf

#
RUN mkdir /app && mkdir /app/public && chown -R apache:apache /app && chmod -R 755 /app && mkdir bootstrap
ADD start.sh /bootstrap/
RUN chmod +x /bootstrap/start.sh

#
EXPOSE 80
ENTRYPOINT ["/bootstrap/start.sh"]
ENTRYPOINT ["/bootstrap/start.sh"]
9 changes: 5 additions & 4 deletions docker-compose.example.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "2"
services:
apache:
build: ./
Expand All @@ -15,12 +14,14 @@ services:
- PHP_XDEBUG_ENABLED=true
networks:
- default
ports:
- "${PORT_NUMBER:-8989}:80"
volumes:
- ./public:/app
- ./public:/app/public
cap_add:
- SYS_TIME
- SYS_NICE

networks:
default:
external:
name: docker_docker-localhost
driver: bridge
1 change: 1 addition & 0 deletions public/.gitkeep
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Кан-Цар keep 7530-03-22