eessppeelllloo/mapknitter
1
0
Fork 0
mirror of https://github.com/publiclab/mapknitter.git synced 2025-12-05 16:00:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove forego and start passenger directly (#1545)

Browse Source 
* Properly link to dockerfile

* Remove forego and start passenger directly

* Remove Procfile

* Attempt to upgrade bundler

* Run thru bundler
This commit is contained in:
Sebastian Silva
2021-10-26 17:35:28 -05:00
committed by GitHub
parent f658f6066e
commit 9b79fb9735
5 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Procfile
View File

@@ -1,2 +0,0 @@
passenger: passenger start --port $PORT
puma: puma -C config/puma.rb

2
docker-compose.yml
View File

@@ -10,7 +10,7 @@ services:
web: web:
build: build:
context: . context: .
dockerfile: ${RAILS_ENV:-production} dockerfile: ./dockerfiles/${RAILS_ENV:-production}
ulimits: ulimits:
core: 0 core: 0
command: [ "sh", "/app/start.sh" ] command: [ "sh", "/app/start.sh" ]

5
dockerfiles/development
View File

@@ -37,11 +37,6 @@ COPY ./nolimit.xml /etc/ImageMagick-6/policy.xml
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt-get install -y npm RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt-get install -y npm
RUN npm install -g yarn RUN npm install -g yarn
# Installing ForeGo to schedule processes
RUN wget https://bin.equinox.io/c/ekMN3bCZFUn/forego-stable-linux-amd64.tgz && \
tar xvf forego-stable-linux-amd64.tgz -C /usr/local/bin && \
rm forego-stable-linux-amd64.tgz
# See https://github.com/instructure/canvas-lms/issues/1404#issuecomment-461023483 and # See https://github.com/instructure/canvas-lms/issues/1404#issuecomment-461023483 and
# https://github.com/publiclab/mapknitter/pull/803 # https://github.com/publiclab/mapknitter/pull/803
RUN git config --global url."https://".insteadOf git:// RUN git config --global url."https://".insteadOf git://

10
dockerfiles/production
View File

@@ -24,11 +24,6 @@ COPY ./nolimit.xml /etc/ImageMagick-6/policy.xml
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt-get install -y npm RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt-get install -y npm
RUN npm install -g yarn RUN npm install -g yarn
# Installing ForeGo to schedule processes
RUN wget https://bin.equinox.io/c/ekMN3bCZFUn/forego-stable-linux-amd64.tgz && \
tar xvf forego-stable-linux-amd64.tgz -C /usr/local/bin && \
rm forego-stable-linux-amd64.tgz
# See https://github.com/instructure/canvas-lms/issues/1404#issuecomment-461023483 and # See https://github.com/instructure/canvas-lms/issues/1404#issuecomment-461023483 and
# https://github.com/publiclab/mapknitter/pull/803 # https://github.com/publiclab/mapknitter/pull/803
RUN git config --global url."https://".insteadOf git:// RUN git config --global url."https://".insteadOf git://
@@ -41,6 +36,9 @@ WORKDIR /app
RUN apt-get clean && \ RUN apt-get clean && \
apt-get autoremove -y apt-get autoremove -y
RUN gem install bundler && bundle install ENV BUNDLER_VERSION=2.1.4
RUN gem install --default bundler && \
gem update --system && \
bundle install
CMD [ "sh", "/app/start.sh" ] CMD [ "sh", "/app/start.sh" ]

2
start.sh
View File

@@ -36,4 +36,4 @@ if [ -f $pidfile ] ; then
rm $pidfile; rm $pidfile;
fi fi
forego start bundle exec passenger start --port $PORT