-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Martin Fenner
committed
Jan 12, 2019
1 parent
ffc60ed
commit c2d4769
Showing
4 changed files
with
8 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,6 @@ LABEL maintainer="[email protected]" | |
|
||
# Set correct environment variables. | ||
ENV HOME /home/app | ||
ENV DOCKERIZE_VERSION v0.6.0 | ||
|
||
# Allow app user to read /etc/container_environment | ||
RUN usermod -a -G docker_env app | ||
|
@@ -19,13 +18,6 @@ RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && | |
apt-get install ntp wget tzdata pandoc -y && \ | ||
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* | ||
|
||
# install dockerize | ||
RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && \ | ||
tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz | ||
|
||
# enable SSH | ||
RUN rm -f /etc/service/sshd/down | ||
|
||
# Enable Passenger and Nginx and remove the default site | ||
# Preserve env variables for nginx | ||
RUN rm -f /etc/service/nginx/down && \ | ||
|
@@ -53,6 +45,10 @@ RUN mkdir -p tmp/pids && \ | |
chown -R app:app /home/app/webapp && \ | ||
chmod -R 755 /home/app/webapp | ||
|
||
# enable SSH | ||
RUN rm -f /etc/service/sshd/down && \ | ||
/etc/my_init.d/00_regen_ssh_host_keys.sh | ||
|
||
# Install Ruby gems for middleman | ||
WORKDIR /home/app/webapp/vendor/middleman | ||
RUN /sbin/setuser app bundle install | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,4 @@ | ||
#!/bin/sh | ||
dockerize -template /home/app/webapp/vendor/docker/authorized_keys.tmpl:/root/.ssh/authorized_keys | ||
if [ "${PUBLIC_KEY}" ]; then | ||
echo "${PUBLIC_KEY}" > /root/.ssh/authorized_keys | ||
fi |
This file was deleted.
Oops, something went wrong.