Browse Source

Use the official alpine image

main
64味小菜 4 years ago
parent
commit
367a4ef295
  1. 7
      aria2/Dockerfile
  2. 1
      custom.env.example
  3. 15
      docker-compose.gen
  4. 7
      motd/Dockerfile
  5. 7
      samba/Dockerfile
  6. 2
      wsdd2

7
aria2/Dockerfile

@ -1,12 +1,15 @@
ARG ALPINE_VERSION=latest ARG ALPINE_VERSION=latest
FROM lzdk64/alpine:${ALPINE_VERSION}-ustc FROM alpine:${ALPINE_VERSION}
ARG APK_MIRROR=dl-cdn.alpinelinux.org
ENV APPEND_OPTS="" ENV APPEND_OPTS=""
COPY aria2.run /usr/local/bin/ COPY aria2.run /usr/local/bin/
COPY aria2.conf.template /etc/aria2/ COPY aria2.conf.template /etc/aria2/
RUN apk --no-cache --no-progress add aria2 && \ RUN sed -i "s/dl-cdn.alpinelinux.org/${APK_MIRROR}/g" /etc/apk/repositories && \
apk --no-cache --no-progress add aria2 && \
mkdir -p /var/aria2 && \ mkdir -p /var/aria2 && \
chmod 777 /var/aria2 && \ chmod 777 /var/aria2 && \
chmod 777 /etc/aria2 && \ chmod 777 /etc/aria2 && \

1
custom.env.example

@ -8,6 +8,7 @@
TZ=Asia/Shanghai TZ=Asia/Shanghai
# docker build args # docker build args
ARGS_APK_MIRROR='mirrors.aliyun.com'
ARGS_ALPINE_VERSION=3.16 ARGS_ALPINE_VERSION=3.16
ARGS_PYTHON_VERSION=3.8 ARGS_PYTHON_VERSION=3.8
ARGS_NGINX_VERSION=1.22 ARGS_NGINX_VERSION=1.22

15
docker-compose.gen

@ -36,7 +36,6 @@ services:
- PYTHON_VERSION=${ARGS_PYTHON_VERSION} - PYTHON_VERSION=${ARGS_PYTHON_VERSION}
- ALPINE_VERSION=${ARGS_ALPINE_VERSION} - ALPINE_VERSION=${ARGS_ALPINE_VERSION}
environment: environment:
- TZ=${TZ:-Asia/Shanghai}
- NMP_ENDPOINT=${PROXY_NMP_ENDPOINT} - NMP_ENDPOINT=${PROXY_NMP_ENDPOINT}
- NMP_TOKEN=${PROXY_NMP_TOKEN} - NMP_TOKEN=${PROXY_NMP_TOKEN}
networks: networks:
@ -52,8 +51,8 @@ services:
context: ./samba context: ./samba
args: args:
- ALPINE_VERSION=${ARGS_ALPINE_VERSION} - ALPINE_VERSION=${ARGS_ALPINE_VERSION}
- APK_MIRROR=${ARGS_APK_MIRROR}
environment: environment:
- TZ=${TZ:-Asia/Shanghai}
- GID_PRIVATE=${SMB_GID_PRIVATE} - GID_PRIVATE=${SMB_GID_PRIVATE}
- GID_PROTECT=${SMB_GID_PROTECT} - GID_PROTECT=${SMB_GID_PROTECT}
- GID_PUBLIC=${SMB_GID_PUBLIC} - GID_PUBLIC=${SMB_GID_PUBLIC}
@ -81,8 +80,8 @@ services:
context: ./wsdd2 context: ./wsdd2
args: args:
- ALPINE_VERSION=${ARGS_ALPINE_VERSION} - ALPINE_VERSION=${ARGS_ALPINE_VERSION}
- APK_MIRROR=${ARGS_APK_MIRROR}
environment: environment:
- TZ=${TZ:-Asia/Shanghai}
- HOSTNAME=$(hostname) - HOSTNAME=$(hostname)
- WORKGROUP=${SMB_WORKGROUP:-WORKGROUP} - WORKGROUP=${SMB_WORKGROUP:-WORKGROUP}
network_mode: host network_mode: host
@ -94,8 +93,6 @@ services:
context: ./nginx context: ./nginx
args: args:
- NGINX_VERSION=${ARGS_NGINX_VERSION} - NGINX_VERSION=${ARGS_NGINX_VERSION}
environment:
- TZ=${TZ:-Asia/Shanghai}
networks: networks:
- localnet - localnet
ports: ports:
@ -111,8 +108,6 @@ services:
php-fpm: php-fpm:
image: "php:${ARGS_PHP_VERSION}-fpm-alpine${ARGS_ALPINE_VERSION}" image: "php:${ARGS_PHP_VERSION}-fpm-alpine${ARGS_ALPINE_VERSION}"
environment:
- TZ=${TZ:-Asia/Shanghai}
networks: networks:
- localnet - localnet
volumes: volumes:
@ -128,8 +123,6 @@ services:
context: ./jellyfin context: ./jellyfin
args: args:
- JELLYFIN_VERSION=${ARGS_JELLYFIN_VERSION} - JELLYFIN_VERSION=${ARGS_JELLYFIN_VERSION}
environment:
- TZ=${TZ:-Asia/Shanghai}
user: ${MEDIA_UGID} user: ${MEDIA_UGID}
group_add: group_add:
- "$MEDIA_GID_RENDER"$( \ - "$MEDIA_GID_RENDER"$( \
@ -157,6 +150,7 @@ services:
context: ./motd context: ./motd
args: args:
- ALPINE_VERSION=${ARGS_ALPINE_VERSION} - ALPINE_VERSION=${ARGS_ALPINE_VERSION}
- APK_MIRROR=${ARGS_APK_MIRROR}
environment: environment:
- TZ=${TZ:-Asia/Shanghai} - TZ=${TZ:-Asia/Shanghai}
networks: networks:
@ -176,8 +170,7 @@ $(for CONF in ${ARIA2_CONFS[@]}; do
context: ./aria2 context: ./aria2
args: args:
- ALPINE_VERSION=${ARGS_ALPINE_VERSION} - ALPINE_VERSION=${ARGS_ALPINE_VERSION}
environment: - APK_MIRROR=${ARGS_APK_MIRROR}
- TZ=${TZ:-Asia/Shanghai}
user: ${SRV_UGID} user: ${SRV_UGID}
networks: networks:
- localnet - localnet

7
motd/Dockerfile

@ -1,7 +1,10 @@
ARG ALPINE_VERSION=latest ARG ALPINE_VERSION=latest
FROM lzdk64/alpine:${ALPINE_VERSION}-ustc FROM alpine:${ALPINE_VERSION}
RUN apk --no-cache --no-progress add jq curl && \ ARG APK_MIRROR=dl-cdn.alpinelinux.org
RUN sed -i "s/dl-cdn.alpinelinux.org/${APK_MIRROR}/g" /etc/apk/repositories && \
apk --no-cache --no-progress add jq curl && \
rm -rf /tmp/* rm -rf /tmp/*
COPY motd.run /etc/periodic/hourly/ COPY motd.run /etc/periodic/hourly/

7
samba/Dockerfile

@ -1,7 +1,10 @@
ARG ALPINE_VERSION=latest ARG ALPINE_VERSION=latest
FROM lzdk64/alpine:${ALPINE_VERSION}-ustc FROM alpine:${ALPINE_VERSION}
RUN apk --no-cache --no-progress add samba && \ ARG APK_MIRROR=dl-cdn.alpinelinux.org
RUN sed -i "s/dl-cdn.alpinelinux.org/${APK_MIRROR}/g" /etc/apk/repositories && \
apk --no-cache --no-progress add samba && \
rm -rf /tmp/* rm -rf /tmp/*
#mv /etc/samba/smb.conf /etc/samba/smb.conf.bak && \ #mv /etc/samba/smb.conf /etc/samba/smb.conf.bak && \
#mv /tmp/smb.conf /etc/samba/smb.conf && \ #mv /tmp/smb.conf /etc/samba/smb.conf && \

2
wsdd2

@ -1 +1 @@
Subproject commit d529565dcc5709f33a9e1b2d14e1f105bd6e14cb Subproject commit 7b37291da03635ecbcfa1b2f99810e5720180d89
Loading…
Cancel
Save