Browse Source

trying to get rid of segfault, changing to ubuntu

main
Holger Frey 3 years ago
parent
commit
064f3a6f2a
  1. 13
      Dockerfile
  2. 44
      Dockerfile-alpine

13
Dockerfile

@ -1,21 +1,20 @@
FROM alpine:3.14 FROM ubuntu:latest
RUN apk upgrade --no-cache RUN apt-get udpate && apt-get upgrade
# add user that will be used to install and run the application # add user that will be used to install and run the application
RUN addgroup -g 1000 deploy #RUN addgroup -g 1000 deploy
RUN adduser -D -u 1000 -G deploy deploy #RUN adduser -D -u 1000 -G deploy deploy
# #
# CUSTOM PART IS BELOW HERE # CUSTOM PART IS BELOW HERE
# #
# install required packages # install required packages
RUN echo "http://dl-cdn.alpinelinux.org/alpine/v3.14/community" >> /etc/apk/repositories RUN apt-get install apache2 apache2-utils apache2-webdav libapache2-mod-svn subversion
RUN apk add --no-cache apache2 apache2-utils apache2-webdav mod_dav_svn subversion
# add svn configuration # add svn configuration
ADD dav_svn.conf /etc/apache2/conf.d/dav_svn.conf ADD dav_svn.conf /etc/apache2/sites-enabled/dav_svn.conf
# create writable directory for dav lock file # create writable directory for dav lock file
RUN mkdir /var/lib/dav/ RUN mkdir /var/lib/dav/

44
Dockerfile-alpine

@ -0,0 +1,44 @@
FROM alpine:3.14
RUN apk upgrade --no-cache
# add user that will be used to install and run the application
RUN addgroup -g 1000 deploy
RUN adduser -D -u 1000 -G deploy deploy
#
# CUSTOM PART IS BELOW HERE
#
# install required packages
RUN echo "http://dl-cdn.alpinelinux.org/alpine/v3.14/community" >> /etc/apk/repositories
RUN apk add --no-cache apache2 apache2-utils apache2-webdav mod_dav_svn subversion
# add svn configuration
ADD dav_svn.conf /etc/apache2/conf.d/dav_svn.conf
# create writable directory for dav lock file
RUN mkdir /var/lib/dav/
#RUN chown deploy:deploy /var/lib/dav/
# apache should run as user deploy
#RUN sed -i.bak -r 's/(User|Group) apache/\1 deploy/' /etc/apache2/httpd.conf
RUN sed -i.bak 's/#ServerName www.example.com:80/ServerName svn.cpi.imtek.uni-freiburg.de:80/' /etc/apache2/httpd.conf
RUN sed -i.bak 's/LogLevel warn/LogLevel debug/' /etc/apache2/httpd.conf
RUN sed -i.bak 's/Listen 80/Listen 80\nListen 8000/' /etc/apache2/httpd.conf
#RUN sed -i.bak 's/#LoadModule deflate_module/LoadModule deflate_module/' /etc/apache2/httpd.conf
#RUN sed -i.bak 's/#LoadModule logio_module/LoadModule logio_module/' /etc/apache2/httpd.conf
# copy the script to run httpd in foreground
COPY httpd-foreground /usr/local/bin/
#RUN chown deploy:deploy /usr/local/bin/httpd-foreground
RUN chmod u+x /usr/local/bin/httpd-foreground
# setup the right permissions for deploy user
#RUN chown -R deploy:deploy /var/www/
#RUN chown -R deploy:deploy /usr/lib/apache2/
#RUN chown -R deploy:deploy /run/apache2/
#RUN chown -R deploy:deploy /var/log/apache2/
#USER deploy
CMD ["httpd-foreground"]
Loading…
Cancel
Save