Skip to content

Release v2.0.1 #4

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
lmakarov merged 1 commit into from
Aug 1, 2017
Merged

Release v2.0.1 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 3 additions & 6 deletions apache2.2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,9 @@ RUN set -x \
&& apk del $buildDeps

# Generate a self-signed cert
RUN set -x \
&& apk add --no-cache openssl \
&& openssl req -x509 -newkey rsa:4086 -days 3650 -nodes -sha256 \
-subj "/C=US/ST=WA/L=Issaquah/O=Atlas/OU=Docksal/CN=default" \
-keyout /usr/local/apache2/conf/server.key \
-out /usr/local/apache2/conf/server.crt \
RUN apk add --no-cache openssl \
&& openssl req -batch -x509 -newkey rsa:4086 -days 3650 -nodes -sha256 \
-keyout /usr/local/apache2/conf/server.key -out /usr/local/apache2/conf/server.crt \
&& apk del openssl

RUN set -x \
Expand Down
16 changes: 3 additions & 13 deletions apache2.4/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
FROM httpd:2.4-alpine

# Generate a self-signed cert
RUN set -x \
&& apk add --no-cache openssl \
&& openssl req -x509 -newkey rsa:4086 -days 3650 -nodes -sha256 \
-subj "/C=US/ST=WA/L=Issaquah/O=Atlas/OU=Docksal/CN=default" \
-keyout /usr/local/apache2/conf/server.key \
-out /usr/local/apache2/conf/server.crt \
RUN apk add --no-cache openssl \
&& openssl req -batch -x509 -newkey rsa:4086 -days 3650 -nodes -sha256 \
-keyout /usr/local/apache2/conf/server.key -out /usr/local/apache2/conf/server.crt \
&& apk del openssl

RUN set -x \
Expand All @@ -20,13 +17,6 @@ RUN set -x \
&& sed -i '/^#.* conf\/extra\/httpd-vhosts.conf/s/^#//' /usr/local/apache2/conf/httpd.conf \
&& sed -i '/^#.* conf\/extra\/httpd-ssl.conf/s/^#//' /usr/local/apache2/conf/httpd.conf

#sed -i '/^#.* cache_module /s/^#//' /usr/local/apache2/conf/httpd.conf && \
#sed -i '/^#.* cache_disk_module /s/^#//' /usr/local/apache2/conf/httpd.conf && \
#sed -i '/^#.* cache_socache_module /s/^#//' /usr/local/apache2/conf/httpd.conf && \
#sed -i '/^#.* socache_shmcb_module /s/^#//' /usr/local/apache2/conf/httpd.conf && \
#sed -i '/^#.* socache_dbm_module /s/^#//' /usr/local/apache2/conf/httpd.conf && \
#sed -i '/^#.* socache_memcache_module /s/^#//' /usr/local/apache2/conf/httpd.conf && \

COPY httpd-foreground /usr/local/bin/
COPY conf /usr/local/apache2/conf

Expand Down