mirror of
https://github.com/semaphoreui/semaphore.git
synced 2025-01-20 23:39:56 +01:00
Merge pull request #1733 from tboerger/timezone-fix
feat(docker): enable TZ env variable for setting timezone
This commit is contained in:
commit
9e4f6406b3
@ -26,7 +26,7 @@ sudo semaphore user add --admin --name "Your Name" --login your_login --email yo
|
||||
```
|
||||
[![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-black.svg)](https://snapcraft.io/semaphore)
|
||||
|
||||
### Docker
|
||||
### Docker
|
||||
|
||||
https://hub.docker.com/r/semaphoreui/semaphore
|
||||
|
||||
@ -44,6 +44,7 @@ services:
|
||||
SEMAPHORE_ADMIN_NAME: admin
|
||||
SEMAPHORE_ADMIN_EMAIL: admin@localhost
|
||||
SEMAPHORE_ADMIN: admin
|
||||
TZ: Europe/Berlin
|
||||
volumes:
|
||||
- /path/to/data/home:/etc/semaphore # config.json location
|
||||
- /path/to/data/lib:/var/lib/semaphore # database.boltdb location (Not required if using mysql or postgres)
|
||||
|
@ -5,7 +5,7 @@ ENV SEMAPHORE_VERSION="development" SEMAPHORE_ARCH="linux_amd64" \
|
||||
APP_ROOT="/go/src/github.com/ansible-semaphore/semaphore/"
|
||||
|
||||
# hadolint ignore=DL3013
|
||||
RUN apk add --no-cache gcc g++ sshpass git mysql-client python3 py3-pip py-openssl openssl ca-certificates curl curl-dev openssh-client-default tini nodejs npm bash rsync && \
|
||||
RUN apk add --no-cache gcc g++ sshpass git mysql-client python3 py3-pip py-openssl openssl ca-certificates curl curl-dev openssh-client-default tini nodejs npm bash rsync tzdata && \
|
||||
apk --update add --virtual build-dependencies python3-dev libffi-dev openssl-dev build-base &&\
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
|
@ -5,7 +5,7 @@ ENV SEMAPHORE_VERSION="development" SEMAPHORE_ARCH="linux_amd64" \
|
||||
APP_ROOT="/go/src/github.com/ansible-semaphore/semaphore/"
|
||||
|
||||
# hadolint ignore=DL3013
|
||||
RUN apk add --no-cache gcc g++ sshpass git mysql-client python3 py3-pip py-openssl openssl ca-certificates curl curl-dev openssh-client-default tini nodejs npm bash rsync && \
|
||||
RUN apk add --no-cache gcc g++ sshpass git mysql-client python3 py3-pip py-openssl openssl ca-certificates curl curl-dev openssh-client-default tini nodejs npm bash rsync tzdata && \
|
||||
apk --update add --virtual build-dependencies python3-dev libffi-dev openssl-dev build-base &&\
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
|
@ -10,7 +10,7 @@ RUN apk add --no-cache -U libc-dev curl nodejs npm git gcc g++ && \
|
||||
FROM alpine:3.18 as runner
|
||||
LABEL maintainer="Tom Whiston <tom.whiston@gmail.com>"
|
||||
|
||||
RUN apk add --no-cache sshpass git curl ansible mysql-client openssh-client-default tini py3-aiohttp && \
|
||||
RUN apk add --no-cache sshpass git curl ansible mysql-client openssh-client-default tini py3-aiohttp tzdata && \
|
||||
adduser -D -u 1001 -G root semaphore && \
|
||||
mkdir -p /tmp/semaphore && \
|
||||
mkdir -p /etc/semaphore && \
|
||||
|
@ -13,7 +13,7 @@ RUN ./deployment/docker/prod/bin/install ${TARGETOS} ${TARGETARCH}
|
||||
FROM alpine:3.18 as runner
|
||||
LABEL maintainer="Tom Whiston <tom.whiston@gmail.com>"
|
||||
|
||||
RUN apk add --no-cache sshpass git curl ansible mysql-client openssh-client-default tini py3-aiohttp && \
|
||||
RUN apk add --no-cache sshpass git curl ansible mysql-client openssh-client-default tini py3-aiohttp tzdata && \
|
||||
adduser -D -u 1001 -G root semaphore && \
|
||||
mkdir -p /tmp/semaphore && \
|
||||
mkdir -p /etc/semaphore && \
|
||||
|
@ -1,6 +1,6 @@
|
||||
FROM dind-ansible:latest
|
||||
|
||||
RUN apk add --no-cache wget git rsync
|
||||
RUN apk add --no-cache wget git rsync tzdata
|
||||
|
||||
RUN adduser -D -u 1001 -G root -G docker semaphore && \
|
||||
mkdir -p /tmp/semaphore && \
|
||||
@ -29,4 +29,4 @@ RUN python3 -m venv ./venv --system-site-packages && \
|
||||
|
||||
RUN echo '{"tmp_path": "/tmp/semaphore","dialect": "bolt", "runner": {"config_file": "/var/lib/semaphore/runner.json"}}' > /etc/semaphore/config.json
|
||||
|
||||
CMD [ "/usr/local/bin/runner-wrapper" ]
|
||||
CMD [ "/usr/local/bin/runner-wrapper" ]
|
||||
|
@ -12,7 +12,7 @@ RUN ./deployment/docker/prod/bin/install ${TARGETOS} ${TARGETARCH}
|
||||
|
||||
FROM alpine/ansible:latest
|
||||
|
||||
RUN apk add --no-cache wget git rsync
|
||||
RUN apk add --no-cache wget git rsync tzdata
|
||||
|
||||
RUN adduser -D -u 1001 -G root semaphore && \
|
||||
mkdir -p /tmp/semaphore && \
|
||||
@ -43,4 +43,4 @@ RUN pip3 install boto3 botocore
|
||||
|
||||
RUN echo '{"tmp_path": "/tmp/semaphore","dialect": "bolt", "runner": {"config_file": "/var/lib/semaphore/runner.json"}}' > /etc/semaphore/config.json
|
||||
|
||||
CMD [ "/usr/local/bin/runner-wrapper" ]
|
||||
CMD [ "/usr/local/bin/runner-wrapper" ]
|
||||
|
Loading…
Reference in New Issue
Block a user