stilleshan
/
dockerfiles
mirror of https://github.com/stilleshan/dockerfiles.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix and optimize workflow

This commit is contained in:
Stille 2022-02-04 16:19:40 +08:00
parent b6452e3ae2
commit 2f1ed007c4
4 changed files with 31 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/docker-build-release.yml vendored
View File

@ -18,8 +18,8 @@ jobs:
- name: Set tag
id: tag
run: |
if [[ -n $(cat ${{ github.event.inputs.project }}/Dockerfile | awk '{if($1~"ENV" && $2~"VERSION")print $3;exit;}') ]]; then
VERSION=$(cat ${{ github.event.inputs.project }}/Dockerfile | awk '{if($1~"ENV" && $2~"VERSION")print $3;exit;}')
if [[ -n $(cat ${{ github.event.inputs.project }}/Dockerfile | awk '{if($1~"ENV" && $2=="VERSION")print $3}') ]]; then
VERSION=$(cat ${{ github.event.inputs.project }}/Dockerfile | awk '{if($1~"ENV" && $2=="VERSION")print $3}')
echo "tag=$VERSION" >> $GITHUB_ENV
else
echo "tag=$(date +%Y)-$(date +%m)-$(date +%d)" >> $GITHUB_ENV

28
frpc/Dockerfile
View File

@ -1,24 +1,22 @@
FROM alpine:3.8
LABEL maintainer="Stille <stille@ioiox.com>"
ENV FRP_VERSION 0.39.0
ENV VERSION 0.39.0
ENV TZ=Asia/Shanghai
WORKDIR /
RUN set -xe && \
apk add tzdata && \
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
echo "Asia/Shanghai" > /etc/timezone && \
apk del tzdata
RUN apk add --no-cache tzdata \
&& ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime \
&& echo ${TZ} > /etc/timezone
RUN set -x && \
if [ "$(uname -m)" = "x86_64" ]; then export PLATFORM=amd64 ; else if [ "$(uname -m)" = "aarch64" ]; then export PLATFORM=arm64 ; fi fi && \
wget --no-check-certificate https://github.com/fatedier/frp/releases/download/v${FRP_VERSION}/frp_${FRP_VERSION}_linux_${PLATFORM}.tar.gz && \
tar xzf frp_${FRP_VERSION}_linux_${PLATFORM}.tar.gz && \
cd frp_${FRP_VERSION}_linux_${PLATFORM} && \
mkdir /frp && \
mv frpc frpc.ini /frp && \
cd .. && \
rm -rf *.tar.gz frp_${FRP_VERSION}_linux_${PLATFORM}
RUN if [ "$(uname -m)" = "x86_64" ]; then export PLATFORM=amd64 ; else if [ "$(uname -m)" = "aarch64" ]; then export PLATFORM=arm64 ; fi fi \
&& wget --no-check-certificate https://github.com/fatedier/frp/releases/download/v${VERSION}/frp_${VERSION}_linux_${PLATFORM}.tar.gz \
&& tar xzf frp_${VERSION}_linux_${PLATFORM}.tar.gz \
&& cd frp_${VERSION}_linux_${PLATFORM} \
&& mkdir /frp \
&& mv frpc frpc.ini /frp \
&& cd .. \
&& rm -rf *.tar.gz frp_${VERSION}_linux_${PLATFORM}
VOLUME /frp

28
frps/Dockerfile
View File

@ -1,24 +1,22 @@
FROM alpine:3.8
LABEL maintainer="Stille <stille@ioiox.com>"
ENV FRP_VERSION 0.39.0
ENV VERSION 0.39.0
ENV TZ=Asia/Shanghai
WORKDIR /
RUN set -xe && \
apk add tzdata && \
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
echo "Asia/Shanghai" > /etc/timezone && \
apk del tzdata
RUN apk add --no-cache tzdata \
&& ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime \
&& echo ${TZ} > /etc/timezone
RUN set -x && \
if [ "$(uname -m)" = "x86_64" ]; then export PLATFORM=amd64 ; else if [ "$(uname -m)" = "aarch64" ]; then export PLATFORM=arm64 ; fi fi && \
wget --no-check-certificate https://github.com/fatedier/frp/releases/download/v${FRP_VERSION}/frp_${FRP_VERSION}_linux_${PLATFORM}.tar.gz && \
tar xzf frp_${FRP_VERSION}_linux_${PLATFORM}.tar.gz && \
cd frp_${FRP_VERSION}_linux_${PLATFORM} && \
mkdir /frp && \
mv frps frps.ini /frp && \
cd .. && \
rm -rf *.tar.gz frp_${FRP_VERSION}_linux_${PLATFORM}
RUN if [ "$(uname -m)" = "x86_64" ]; then export PLATFORM=amd64 ; else if [ "$(uname -m)" = "aarch64" ]; then export PLATFORM=arm64 ; fi fi \
&& wget --no-check-certificate https://github.com/fatedier/frp/releases/download/v${VERSION}/frp_${VERSION}_linux_${PLATFORM}.tar.gz \
&& tar xzf frp_${VERSION}_linux_${PLATFORM}.tar.gz \
&& cd frp_${VERSION}_linux_${PLATFORM} \
&& mkdir /frp \
&& mv frps frps.ini /frp \
&& cd .. \
&& rm -rf *.tar.gz frp_${VERSION}_linux_${PLATFORM}
VOLUME /frp

6
ocserv/Dockerfile
View File

@ -1,7 +1,7 @@
FROM alpine:3.13.5
LABEL maintainer="Amin Vakil <info@aminvakil.com>"
ENV OC_VERSION 1.1.2
ENV VERSION 1.1.2
RUN apk add --no-cache bash
@ -25,8 +25,8 @@ RUN buildDeps=( \
); \
set -x \
&& apk add --update --virtual .build-deps "${buildDeps[@]}" \
&& curl -SL --connect-timeout 8 --max-time 120 --retry 128 --retry-delay 5 "ftp://ftp.infradead.org/pub/ocserv/ocserv-$OC_VERSION.tar.xz" -o ocserv.tar.xz \
&& curl -SL --connect-timeout 8 --max-time 120 --retry 128 --retry-delay 5 "ftp://ftp.infradead.org/pub/ocserv/ocserv-$OC_VERSION.tar.xz.sig" -o ocserv.tar.xz.sig \
&& curl -SL --connect-timeout 8 --max-time 120 --retry 128 --retry-delay 5 "ftp://ftp.infradead.org/pub/ocserv/ocserv-$VERSION.tar.xz" -o ocserv.tar.xz \
&& curl -SL --connect-timeout 8 --max-time 120 --retry 128 --retry-delay 5 "ftp://ftp.infradead.org/pub/ocserv/ocserv-$VERSION.tar.xz.sig" -o ocserv.tar.xz.sig \
&& gpg --keyserver keys.gnupg.net --recv-key 96865171 \
&& gpg --verify ocserv.tar.xz.sig \
&& mkdir -p /usr/src/ocserv \