3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-08-06 14:38:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

misc: minor reorganization on devenv dockerfile

Browse source
This commit is contained in:
Andrey Antukh 2019-06-05 10:07:01 +00:00
parent cff438eccc
commit a43fc529e7
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
docker/devenv/Dockerfile
View file

@ -13,10 +13,11 @@ RUN set -ex; \
locales \ locales \
ca-certificates \ ca-certificates \
wget \ wget \
; \ sudo \
rm -rf /var/lib/apt/lists/*; \ tmux \
apt-get update -yq && \ vim \
apt-get install -yq \ curl \
zsh \
bash \ bash \
git \ git \
openjdk-8-jdk \ openjdk-8-jdk \
@ -25,29 +26,28 @@ RUN set -ex; \
imagemagick \ imagemagick \
webp \ webp \
; \ ; \
mkdir -p /etc/resolvconf/resolv.conf.d; \ rm -rf /var/lib/apt/lists/*;
echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/tail;
RUN set -ex; \ RUN set -ex; \
echo "deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main" >> /etc/apt/sources.list; \ echo "deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main" >> /etc/apt/sources.list; \
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -; \ wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -; \
apt-get update -yq && \ apt-get update -yq && \
apt-get install -yq \ apt-get install -yq \
postgresql-9.6 \ postgresql-9.6 \
postgresql-contrib-9.6 \ postgresql-contrib-9.6 \
sudo \ ;\
tmux \ rm -rf /var/lib/apt/lists/*;
vim \
curl \ RUN set -ex; \
zsh \ mkdir -p /etc/resolvconf/resolv.conf.d; \
; echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/tail;
COPY files/pg_hba.conf /etc/postgresql/9.6/main/pg_hba.conf COPY files/pg_hba.conf /etc/postgresql/9.6/main/pg_hba.conf
COPY files/bashrc /root/.bashrc COPY files/bashrc /root/.bashrc
COPY files/vimrc /root/.vimrc COPY files/vimrc /root/.vimrc
RUN set -ex; \ RUN set -ex; \
/etc/init.d/postgresql start \ /etc/init.d/postgresql start \
&& createuser -U postgres -sl uxbox \ && createuser -U postgres -sl uxbox \
&& createdb -U uxbox uxbox \ && createdb -U uxbox uxbox \
&& createdb -U uxbox test \ && createdb -U uxbox test \
@ -58,7 +58,7 @@ EXPOSE 6060
EXPOSE 9090 EXPOSE 9090
RUN set -ex; \ RUN set -ex; \
useradd -m -g users -s /bin/zsh -u $EXTERNAL_UID uxbox; \ useradd -m -g users -s /bin/zsh -u $EXTERNAL_UID uxbox; \
passwd uxbox -d; \ passwd uxbox -d; \
echo "uxbox ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers echo "uxbox ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers