bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2026-01-06 02:23:51 +00:00
Code Issues Releases Wiki Activity

change confd to hbs for unified docker templates (#2434)

Browse Source 
* change confd to hbs tool

* use new repo owner
This commit is contained in:
Kyle Spearrin
2022-11-23 12:48:34 -05:00
committed by GitHub
parent 0795545fb8
commit 93afa93b85
7 changed files with 62 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
docker-unified/Dockerfile
View File

@@ -214,6 +214,7 @@ RUN apk add --update-cache \
su-exec \
supervisor \
tzdata \
unzip \
&& rm -rf /var/cache/apk/*
# Create non-root user to run app
@@ -261,18 +262,18 @@ COPY docker-unified/nginx/logrotate.sh /
RUN chmod +x /logrotate.sh
# Copy configuration templates
COPY docker-unified/confd/nginx-config.toml /etc/confd/conf.d/
COPY docker-unified/confd/nginx-config.conf.tmpl /etc/confd/templates/
COPY docker-unified/confd/app-id.toml /etc/confd/conf.d/
COPY docker-unified/confd/app-id.conf.tmpl /etc/confd/templates/
COPY docker-unified/hbs/nginx-config.hbs /etc/hbs/
COPY docker-unified/hbs/app-id.hbs /etc/hbs/
COPY docker-unified/hbs/config.yaml /etc/hbs/
# Download confd tool for generating final configurations
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ] ; then curl -L --output confd.tar.gz https://github.com/abtreece/confd/releases/download/v0.19.1/confd-v0.19.1-linux-amd64.tar.gz; fi
RUN if [ "$TARGETPLATFORM" = "linux/arm/v7" ] ; then curl -L --output confd.tar.gz https://github.com/abtreece/confd/releases/download/v0.19.1/confd-v0.19.1-linux-arm7.tar.gz; fi
RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] ; then curl -L --output confd.tar.gz https://github.com/abtreece/confd/releases/download/v0.19.1/confd-v0.19.1-linux-arm64.tar.gz; fi
# Download hbs tool for generating final configurations
RUN if [ "$TARGETPLATFORM" = "linux/amd64" ] ; then curl -L --output hbs.zip https://github.com/bitwarden/Handlebars.conf/releases/download/v1.2.0/hbs_linux-musl-x64_dotnet.zip; fi
RUN if [ "$TARGETPLATFORM" = "linux/arm/v7" ] ; then curl -L --output hbs.zip https://github.com/bitwarden/Handlebars.conf/releases/download/v1.2.0/hbs_linux-arm_dotnet.zip; fi
RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] ; then curl -L --output hbs.zip https://github.com/bitwarden/Handlebars.conf/releases/download/v1.2.0/hbs_linux-arm64_dotnet.zip; fi
# Extract confd
RUN tar -xvzo -C /usr/local/bin -f confd.tar.gz && rm confd.tar.gz
# Extract hbs
RUN unzip hbs.zip -d /usr/local/bin && rm hbs.zip
RUN chmod +x /usr/local/bin/hbs
# Copy entrypoint script and make it executable
COPY docker-unified/entrypoint.sh /entrypoint.sh