Skip to content

Commit 4c6d0f6

Browse files
committed
Update web api docker contianer
1 parent 4ec985b commit 4c6d0f6

File tree

1 file changed

+18
-21
lines changed

1 file changed

+18
-21
lines changed

images/web/Dockerfile

+18-21
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
FROM ruby:3.3.0
1+
FROM phusion/passenger-ruby33
22
ENV DEBIAN_FRONTEND=noninteractive
33
ENV workdir /var/www
4-
5-
# Production OSM setup
64
ENV RAILS_ENV=production
75

86
# Install the openstreetmap-website dependencies
@@ -24,17 +22,17 @@ RUN apt-get update && apt-get install -y nodejs yarn && \
2422
apt-get clean && \
2523
rm -rf /var/lib/apt/lists/*
2624

27-
# Install Passenger + Apache module
28-
RUN apt-get update && apt-get install -y \
29-
cmake \
30-
libgcrypt20 \
31-
openssl \
32-
rubygems \
33-
s3cmd && \
34-
apt-get clean && \
35-
rm -rf /var/lib/apt/lists/*
36-
RUN gem install passenger
37-
RUN passenger-install-apache2-module
25+
# # Install Passenger + Apache module
26+
# RUN apt-get update && apt-get install -y \
27+
# cmake \
28+
# libgcrypt20 \
29+
# openssl \
30+
# rubygems \
31+
# s3cmd && \
32+
# apt-get clean && \
33+
# rm -rf /var/lib/apt/lists/*
34+
# RUN gem install passenger
35+
# RUN passenger-install-apache2-module
3836

3937
# RUN apt-get install -y libapache2-mod-passenger lighttpd
4038

@@ -99,14 +97,13 @@ RUN a2enmod setenvif
9997
RUN a2dissite 000-default
10098
RUN a2ensite production
10199

102-
# # Install Passenger + Apache module
103-
# RUN apt-key adv --refresh-keys --keyserver keyserver.ubuntu.com
104-
# RUN apt-get update
105-
# RUN apt-get install -y libapache2-mod-passenger lighttpd
106-
107100
# Enable the Passenger Apache module and restart Apache
108101
RUN echo "ServerName $(cat /etc/hostname)" >> /etc/apache2/apache2.conf
109-
RUN a2enmod passenger
102+
103+
# # Install Passenger + Apache module
104+
RUN passenger-install-apache2-module
105+
106+
# RUN a2enmod passenger
110107

111108
# Check installation
112109
RUN /usr/bin/passenger-config validate-install
@@ -116,7 +113,7 @@ RUN /usr/sbin/passenger-memory-stats
116113
RUN a2enmod proxy proxy_http rewrite lbmethod_byrequests proxy_fcgi
117114

118115
# Config the virtual host apache2
119-
RUN apache2ctl configtest
116+
# RUN apache2ctl configtest
120117

121118
# Set Permissions for www-data
122119
RUN chown -R www-data: $workdir

0 commit comments

Comments
 (0)