alpine 3.6

This commit is contained in:
Wonderfall 2017-05-27 01:46:23 +02:00
parent 5238f438d7
commit 338e0a290f
7 changed files with 40 additions and 30 deletions

View File

@ -1,4 +1,4 @@
FROM alpine:3.5 FROM alpine:3.6
ARG GHOST_VERSION=0.11.9 ARG GHOST_VERSION=0.11.9
@ -34,6 +34,7 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
tini@commuedge \ tini@commuedge \
su-exec \ su-exec \
nodejs \ nodejs \
nodejs-npm \
&& wget -q https://github.com/TryGhost/Ghost/releases/download/${GHOST_VERSION}/Ghost-${GHOST_VERSION}.zip -P /tmp \ && wget -q https://github.com/TryGhost/Ghost/releases/download/${GHOST_VERSION}/Ghost-${GHOST_VERSION}.zip -P /tmp \
&& unzip -q /tmp/Ghost-${GHOST_VERSION}.zip -d /ghost \ && unzip -q /tmp/Ghost-${GHOST_VERSION}.zip -d /ghost \
&& cd /ghost \ && cd /ghost \

View File

@ -1,29 +1,28 @@
FROM alpine:3.5 FROM alpine:3.6
ARG ISSO_VER=0.10.6 ARG ISSO_VER=0.10.6
ENV GID=1000 UID=1000 ENV GID=1000 UID=1000
RUN echo "@community https://nl.alpinelinux.org/alpine/v3.4/community" >> /etc/apk/repositories \ RUN apk -U upgrade \
&& BUILD_DEPS=" \ && apk add -t build-dependencies \
python-dev \ python-dev \
libffi-dev \ libffi-dev \
py2-pip \ py2-pip \
build-base" \ build-base \
&& apk -U add \ && apk add \
${BUILD_DEPS} \
python \ python \
py-setuptools \ py-setuptools \
sqlite \ sqlite \
libressl \ libressl \
ca-certificates \ ca-certificates \
su-exec \ su-exec \
tini@community \ tini \
&& pip install --no-cache cffi \ && pip install --no-cache cffi \
&& pip install --no-cache misaka==1.0.2 \ && pip install --no-cache misaka==1.0.2 \
&& pip install --no-cache "isso==${ISSO_VER}" \ && pip install --no-cache "isso==${ISSO_VER}" \
&& apk del ${BUILD_DEPS} \ && apk del build-dependencies \
&& rm -rf /var/cache/apk/* /tmp/* && rm -rf /tmp/* /var/cache/apk/*
COPY run.sh /usr/local/bin/run.sh COPY run.sh /usr/local/bin/run.sh

View File

@ -1,4 +1,4 @@
FROM alpine:3.5 FROM alpine:3.6
ARG VERSION=6.2 ARG VERSION=6.2
@ -6,14 +6,14 @@ ENV UID=991 GID=991
WORKDIR /libresonic WORKDIR /libresonic
RUN echo "@community https://nl.alpinelinux.org/alpine/v3.5/community" >> /etc/apk/repositories \ RUN echo "@community https://nl.alpinelinux.org/alpine/v3.6/community" >> /etc/apk/repositories \
&& apk -U upgrade && apk add \ && apk -U upgrade && apk add \
ffmpeg \ ffmpeg \
su-exec \ su-exec \
libressl \ libressl \
ca-certificates \ ca-certificates \
openjdk8-jre@community \ openjdk8-jre@community \
tini@community \ tini \
&& wget -q https://github.com/Libresonic/libresonic/releases/download/v${VERSION}/libresonic-v${VERSION}.war -O libresonic.war \ && wget -q https://github.com/Libresonic/libresonic/releases/download/v${VERSION}/libresonic-v${VERSION}.war -O libresonic.war \
&& rm -f /var/cache/apk/* && rm -f /var/cache/apk/*
@ -25,8 +25,8 @@ EXPOSE 4040
VOLUME /data /musics /playlists /podcasts VOLUME /data /musics /playlists /podcasts
LABEL description "Open source media streamer" \ LABEL description="Open source media streamer" \
libresonic "Libresonic v$VERSION" \ libresonic="Libresonic v$VERSION" \
maintainer="Wonderfall <wonderfall@targaryen.house>" maintainer="Wonderfall <wonderfall@targaryen.house>"
CMD ["run.sh"] CMD ["run.sh"]

View File

@ -1,15 +1,16 @@
FROM alpine:edge FROM alpine:3.6
ENV UID=991 GID=991 ENV UID=991 GID=991
RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ RUN apk -U --no-cache add \
&& apk -U add pgbouncer@testing tini su-exec \ pgbouncer \
&& rm -rf /var/cache/apk/* tini \
su-exec
COPY run.sh /usr/local/bin/run.sh COPY run.sh /usr/local/bin/run.sh
RUN chmod +x /usr/local/bin/run.sh RUN chmod +x /usr/local/bin/run.sh
VOLUME /config VOLUME /etc/pgbouncer
CMD ["/sbin/tini","--","run.sh"] CMD ["run.sh"]

10
pgbouncer/README.md Normal file
View File

@ -0,0 +1,10 @@
## wonderfall/pgbouncer
Minimal image for [PgBouncer](https://pgbouncer.github.io/).
### Volumes
- /etc/pgbouncer
### Environment variables
- **GID** : user id *(default : 991)*
- **UID** : group id *(default : 991)*

View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/sh
mkdir /run/pgbouncer mkdir /run/pgbouncer
chown -R $UID:$GID /etc/pgbouncer /var/log/pgbouncer /run/pgbouncer chown -R $UID:$GID /etc/pgbouncer /var/log/pgbouncer /run/pgbouncer
su-exec $UID:$GID pgbouncer /etc/pgbouncer/pgbouncer.ini exec su-exec $UID:$GID /sbin/tini -- pgbouncer /etc/pgbouncer/pgbouncer.ini

View File

@ -1,10 +1,10 @@
FROM alpine:3.5 FROM alpine:3.6
ENV BASE_URL=False IMAGE_PROXY=False \ ENV BASE_URL=False IMAGE_PROXY=False \
UID=991 GID=991 UID=991 GID=991
RUN echo "@community https://nl.alpinelinux.org/alpine/v3.5/community" >> /etc/apk/repositories \ RUN apk -U upgrade \
&& BUILD_DEPS=" \ && apk add -t build-dependencies \
build-base \ build-base \
python-dev \ python-dev \
libffi-dev \ libffi-dev \
@ -12,21 +12,20 @@ RUN echo "@community https://nl.alpinelinux.org/alpine/v3.5/community" >> /etc/a
libxml2-dev \ libxml2-dev \
openssl-dev \ openssl-dev \
tar \ tar \
ca-certificates" \ ca-certificates \
&& apk -U add \ && apk add \
${BUILD_DEPS} \
su-exec \ su-exec \
python \ python \
libxml2 \ libxml2 \
libxslt \ libxslt \
openssl \ openssl \
tini@community \ tini \
py2-pip \ py2-pip \
&& pip install --no-cache -r https://raw.githubusercontent.com/asciimoo/searx/master/requirements.txt \ && pip install --no-cache -r https://raw.githubusercontent.com/asciimoo/searx/master/requirements.txt \
&& mkdir /usr/local/searx && cd /usr/local/searx \ && mkdir /usr/local/searx && cd /usr/local/searx \
&& wget -qO- https://github.com/asciimoo/searx/archive/master.tar.gz | tar xz --strip 1 \ && wget -qO- https://github.com/asciimoo/searx/archive/master.tar.gz | tar xz --strip 1 \
&& sed -i "s/127.0.0.1/0.0.0.0/g" searx/settings.yml \ && sed -i "s/127.0.0.1/0.0.0.0/g" searx/settings.yml \
&& apk del ${BUILD_DEPS} \ && apk del build-dependencies \
&& rm -f /var/cache/apk/* && rm -f /var/cache/apk/*
COPY run.sh /usr/local/bin/run.sh COPY run.sh /usr/local/bin/run.sh