Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 097a81f

Browse files
Removed openssh server
Added apcu extension
1 parent 5fb569f commit 097a81f

File tree

4 files changed

+27
-34
lines changed

4 files changed

+27
-34
lines changed

‎Dockerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ARG BUILD_CONFIG=dev
1414

1515
RUN apk --no-cache add libmcrypt-dev autoconf gcc freetype libpng libjpeg-turbo freetype-dev libpng-dev \
1616
libjpeg-turbo-dev make libc-dev pcre-dev \
17-
wget git openssh nginx ca-certificates supervisor bash \
17+
openssh wget git nginx ca-certificates supervisor bash \
1818
&& pecl install mcrypt-1.0.1 xdebug \
1919
&& docker-php-ext-enable mcrypt xdebug \
2020
&& docker-php-ext-install mbstring mysqli pdo_mysql opcache \
@@ -66,6 +66,12 @@ WORKDIR /
6666

6767
VOLUME /var/www
6868

69+
# Expose ports
70+
71+
EXPOSE 9000
72+
EXPOSE 443
73+
EXPOSE 80
74+
6975
#Entrypoint
7076

7177
CMD ["/bin/bash", "/start.sh"]

‎config-dev/supervisord.conf

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,6 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
2121
[supervisorctl]
2222
serverurl=unix:///tmp/supervisor.sock ; use a unix:// URL for a unix socket
2323

24-
;Start sshd
25-
[program:sshd]
26-
command=/usr/sbin/sshd -D
27-
autostart=true
28-
autorestart=true
29-
priority=3
30-
stdout_events_enabled=true
31-
stderr_events_enabled=true
32-
stdout_logfile=/dev/stdout
33-
stdout_logfile_maxbytes=0
34-
3524
;Start php-fpm
3625
[program:php-fpm]
3726
command=/usr/local/sbin/php-fpm -F

‎custom/phpdev/Dockerfile

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,30 +39,30 @@ RUN docker-php-source extract && \
3939
docker-php-ext-enable xdebug redis && \
4040
docker-php-source delete
4141

42-
# Install php extensions
42+
# Install extra extensions
4343
RUN set -ex \
44-
&& pecl install igbinary zip \
45-
&& docker-php-ext-enable igbinary zip \
44+
&& pecl install igbinary zip apcu-5.1.12 \
45+
&& docker-php-ext-enable igbinary zip apcu \
4646
&& docker-php-ext-install pdo bcmath curl intl pdo_mysql pdo_pgsql soap xml xmlrpc json readline \
4747
sodium calendar simplexml tidy xmlrpc \
4848
&& CFLAGS="-I/usr/src/php" docker-php-ext-install xmlreader
4949

5050
# Install sshd
51-
RUN apk --update add --no-cache openssh bash \
52-
&& sed -i s/#PermitRootLogin.*/PermitRootLogin\ yes/ /etc/ssh/sshd_config \
53-
&& echo "root:root" | chpasswd \
54-
&& rm -rf /var/cache/apk/*
55-
RUN sed -ie 's/#Port 22/Port 22/g' /etc/ssh/sshd_config
56-
RUN sed -ri 's/#HostKey \/etc\/ssh\/ssh_host_key/HostKey \/etc\/ssh\/ssh_host_key/g' /etc/ssh/sshd_config
57-
RUN sed -ir 's/#HostKey \/etc\/ssh\/ssh_host_rsa_key/HostKey \/etc\/ssh\/ssh_host_rsa_key/g' /etc/ssh/sshd_config
58-
RUN sed -ir 's/#HostKey \/etc\/ssh\/ssh_host_dsa_key/HostKey \/etc\/ssh\/ssh_host_dsa_key/g' /etc/ssh/sshd_config
59-
RUN sed -ir 's/#HostKey \/etc\/ssh\/ssh_host_ecdsa_key/HostKey \/etc\/ssh\/ssh_host_ecdsa_key/g' /etc/ssh/sshd_config
60-
RUN sed -ir 's/#HostKey \/etc\/ssh\/ssh_host_ed25519_key/HostKey \/etc\/ssh\/ssh_host_ed25519_key/g' /etc/ssh/sshd_config
61-
RUN /usr/bin/ssh-keygen -A
62-
RUN ssh-keygen -t rsa -b 4096 -f /etc/ssh/ssh_host_key
51+
#RUN apk --update add --no-cache openssh bash \
52+
# && sed -i s/#PermitRootLogin.*/PermitRootLogin\ yes/ /etc/ssh/sshd_config \
53+
# && echo "root:root" | chpasswd \
54+
# && rm -rf /var/cache/apk/*
55+
#RUN sed -ie 's/#Port 22/Port 22/g' /etc/ssh/sshd_config
56+
#RUN sed -ri 's/#HostKey \/etc\/ssh\/ssh_host_key/HostKey \/etc\/ssh\/ssh_host_key/g' /etc/ssh/sshd_config
57+
#RUN sed -ir 's/#HostKey \/etc\/ssh\/ssh_host_rsa_key/HostKey \/etc\/ssh\/ssh_host_rsa_key/g' /etc/ssh/sshd_config
58+
#RUN sed -ir 's/#HostKey \/etc\/ssh\/ssh_host_dsa_key/HostKey \/etc\/ssh\/ssh_host_dsa_key/g' /etc/ssh/sshd_config
59+
#RUN sed -ir 's/#HostKey \/etc\/ssh\/ssh_host_ecdsa_key/HostKey \/etc\/ssh\/ssh_host_ecdsa_key/g' /etc/ssh/sshd_config
60+
#RUN sed -ir 's/#HostKey \/etc\/ssh\/ssh_host_ed25519_key/HostKey \/etc\/ssh\/ssh_host_ed25519_key/g' /etc/ssh/sshd_config
61+
#RUN /usr/bin/ssh-keygen -A
62+
#RUN ssh-keygen -t rsa -b 4096 -f /etc/ssh/ssh_host_key
6363

6464
# Expose port 80
6565
EXPOSE 80
6666

6767
# Expose port 22
68-
EXPOSE 22
68+
#EXPOSE 22

‎init-scripts/container.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,11 @@ cd /var/www
7878

7979
# Copy env file
8080

81-
if [ -f "/var/www/.env.example" ]; then
82-
echo"Copying .env.example to .env"
83-
cp -n .env.example .env
84-
fi
81+
if [ !-f "/var/www/.env" ]; then
82+
83+
if [ -f"/var/www/.env.dist" ] ;then cp .env.dist .env;fi
84+
if [ -f"/var/www/.env.example" ] ;then cp .env.example .env;fi
8585

86-
if [ -f "/var/www/.env.dist" ] ; then
87-
cp -n .env.dist .env
8886
fi
8987

9088
# Create Xdebug log file

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /