Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

components updated #125

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

components updated #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM alpine:3.12
FROM alpine:3
LABEL maintainer="Huan LI <[email protected]>"

ENV BATS_VERSION 1.2.1
ENV S6_VERSION 2.1.0.0
ENV BATS_VERSION 1.10.0
ENV S6_VERSION 3.1.5.0

## Install System

Expand All @@ -11,7 +11,6 @@ RUN apk add --update --no-cache \
coreutils \
curl \
cyrus-sasl \
cyrus-sasl-plain \
cyrus-sasl-login \
ca-certificates \
drill \
Expand Down Expand Up @@ -46,6 +45,7 @@ COPY install/sender_header_filter.pcre /etc/postfix/sender_header_filter.pcre
RUN cat /dev/null > /etc/postfix/aliases && newaliases \
&& echo simple-mail-forwarder.com > /etc/hostname \
&& mkdir -p /run/opendkim && chown opendkim:opendkim /run/opendkim \
&& mkdir -p /etc/sasl2/ \
&& echo test | saslpasswd2 -p [email protected] \
&& chown postfix /etc/sasl2/sasldb2 \
&& saslpasswd2 -d [email protected]
Expand Down
9 changes: 4 additions & 5 deletions script/install-s6-overlay.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,14 @@ case $(uname -m) in
ARCH=x86
;;
x86_64)
ARCH=amd64
ARCH=x86_64
;;
*)
echo "ARCH not supported: $ARCH"
exit 1
;;
esac

URL="https://github.com/just-containers/s6-overlay/releases/download/v${S6_VERSION}/s6-overlay-${ARCH}.tar.gz"

curl -L -s https://github.com/just-containers/s6-overlay/releases/download/v${S6_VERSION}/s6-overlay-amd64.tar.gz \
| tar xzf - -C /
URL="https://github.com/just-containers/s6-overlay/releases/download/v${S6_VERSION}/s6-overlay-${ARCH}.tar.xz"
curl -L -s $URL \
| tar -xJf - -C /