topaLE
/
vaultwarden
mirror of https://github.com/dani-garcia/vaultwarden
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Remove duplicate empty lines in generated Dockerfiles 

Checked with:

```Shell
find . -type f -print0 | xargs -0 pcregrep -M '\n\n\n'
```
pull/784/head
Robin Schneider 5 years ago
parent
446fc3f1f8
commit
f6a4a2127b
No known key found for this signature in database GPG Key ID: A81E8006DC95EFE6
13 changed files with 4 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      docker/Dockerfile.j2
  2. 1
      docker/aarch64/mysql/Dockerfile
  3. 1
      docker/aarch64/sqlite/Dockerfile
  4. 2
      docker/amd64/mysql/Dockerfile
  5. 1
      docker/amd64/mysql/Dockerfile.alpine
  6. 2
      docker/amd64/postgresql/Dockerfile
  7. 1
      docker/amd64/postgresql/Dockerfile.alpine
  8. 2
      docker/amd64/sqlite/Dockerfile
  9. 1
      docker/amd64/sqlite/Dockerfile.alpine
  10. 1
      docker/armv6/mysql/Dockerfile
  11. 1
      docker/armv6/sqlite/Dockerfile
  12. 1
      docker/armv7/mysql/Dockerfile
  13. 1
      docker/armv7/sqlite/Dockerfile

7
docker/Dockerfile.j2
View File

@ -37,7 +37,6 @@ RUN apk add --no-cache --upgrade \
curl \ curl \
tar tar
{% else %} {% else %}
# Build time options to avoid dpkg warnings and help with reproducible builds. # Build time options to avoid dpkg warnings and help with reproducible builds.
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ARG LANG=C.UTF-8 ARG LANG=C.UTF-8
@ -76,14 +75,16 @@ FROM {{ build_stage_base_image }} as build
{% if "sqlite" in target_file %} {% if "sqlite" in target_file %}
# set sqlite as default for DB ARG for backward compatibility # set sqlite as default for DB ARG for backward compatibility
ARG DB=sqlite ARG DB=sqlite
{% elif "mysql" in target_file %} {% elif "mysql" in target_file %}
# set mysql backend # set mysql backend
ARG DB=mysql ARG DB=mysql
{% elif "postgresql" in target_file %} {% elif "postgresql" in target_file %}
# set postgresql backend # set postgresql backend
ARG DB=postgresql ARG DB=postgresql
{% endif %}
{% endif %}
# Build time options to avoid dpkg warnings and help with reproducible builds. # Build time options to avoid dpkg warnings and help with reproducible builds.
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ARG LANG=C.UTF-8 ARG LANG=C.UTF-8
@ -244,8 +245,8 @@ ENV SSL_CERT_DIR=/etc/ssl/certs
{% if "amd64" not in target_file %} {% if "amd64" not in target_file %}
RUN [ "cross-build-start" ] RUN [ "cross-build-start" ]
{% endif %}
{% endif %}
# Install needed libraries # Install needed libraries
{% if "alpine" in runtime_stage_base_image %} {% if "alpine" in runtime_stage_base_image %}
RUN apk add --no-cache \ RUN apk add --no-cache \

1
docker/aarch64/mysql/Dockerfile
View File

@ -8,7 +8,6 @@ ENV VAULT_VERSION "v2.12.0b"
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
# Build time options to avoid dpkg warnings and help with reproducible builds. # Build time options to avoid dpkg warnings and help with reproducible builds.
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ARG LANG=C.UTF-8 ARG LANG=C.UTF-8

1
docker/aarch64/sqlite/Dockerfile
View File

@ -8,7 +8,6 @@ ENV VAULT_VERSION "v2.12.0b"
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
# Build time options to avoid dpkg warnings and help with reproducible builds. # Build time options to avoid dpkg warnings and help with reproducible builds.
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ARG LANG=C.UTF-8 ARG LANG=C.UTF-8

2
docker/amd64/mysql/Dockerfile
View File

@ -8,7 +8,6 @@ ENV VAULT_VERSION "v2.12.0b"
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
# Build time options to avoid dpkg warnings and help with reproducible builds. # Build time options to avoid dpkg warnings and help with reproducible builds.
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ARG LANG=C.UTF-8 ARG LANG=C.UTF-8
@ -88,7 +87,6 @@ ENV ROCKET_ENV "staging"
ENV ROCKET_PORT=80 ENV ROCKET_PORT=80
ENV ROCKET_WORKERS=10 ENV ROCKET_WORKERS=10
# Install needed libraries # Install needed libraries
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
--no-install-recommends \ --no-install-recommends \

1
docker/amd64/mysql/Dockerfile.alpine
View File

@ -82,7 +82,6 @@ ENV ROCKET_PORT=80
ENV ROCKET_WORKERS=10 ENV ROCKET_WORKERS=10
ENV SSL_CERT_DIR=/etc/ssl/certs ENV SSL_CERT_DIR=/etc/ssl/certs
# Install needed libraries # Install needed libraries
RUN apk add --no-cache \ RUN apk add --no-cache \
openssl \ openssl \

2
docker/amd64/postgresql/Dockerfile
View File

@ -8,7 +8,6 @@ ENV VAULT_VERSION "v2.12.0b"
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
# Build time options to avoid dpkg warnings and help with reproducible builds. # Build time options to avoid dpkg warnings and help with reproducible builds.
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ARG LANG=C.UTF-8 ARG LANG=C.UTF-8
@ -88,7 +87,6 @@ ENV ROCKET_ENV "staging"
ENV ROCKET_PORT=80 ENV ROCKET_PORT=80
ENV ROCKET_WORKERS=10 ENV ROCKET_WORKERS=10
# Install needed libraries # Install needed libraries
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
--no-install-recommends \ --no-install-recommends \

1
docker/amd64/postgresql/Dockerfile.alpine
View File

@ -82,7 +82,6 @@ ENV ROCKET_PORT=80
ENV ROCKET_WORKERS=10 ENV ROCKET_WORKERS=10
ENV SSL_CERT_DIR=/etc/ssl/certs ENV SSL_CERT_DIR=/etc/ssl/certs
# Install needed libraries # Install needed libraries
RUN apk add --no-cache \ RUN apk add --no-cache \
openssl \ openssl \

2
docker/amd64/sqlite/Dockerfile
View File

@ -8,7 +8,6 @@ ENV VAULT_VERSION "v2.12.0b"
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
# Build time options to avoid dpkg warnings and help with reproducible builds. # Build time options to avoid dpkg warnings and help with reproducible builds.
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ARG LANG=C.UTF-8 ARG LANG=C.UTF-8
@ -82,7 +81,6 @@ ENV ROCKET_ENV "staging"
ENV ROCKET_PORT=80 ENV ROCKET_PORT=80
ENV ROCKET_WORKERS=10 ENV ROCKET_WORKERS=10
# Install needed libraries # Install needed libraries
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
--no-install-recommends \ --no-install-recommends \

1
docker/amd64/sqlite/Dockerfile.alpine
View File

@ -76,7 +76,6 @@ ENV ROCKET_PORT=80
ENV ROCKET_WORKERS=10 ENV ROCKET_WORKERS=10
ENV SSL_CERT_DIR=/etc/ssl/certs ENV SSL_CERT_DIR=/etc/ssl/certs
# Install needed libraries # Install needed libraries
RUN apk add --no-cache \ RUN apk add --no-cache \
openssl \ openssl \

1
docker/armv6/mysql/Dockerfile
View File

@ -8,7 +8,6 @@ ENV VAULT_VERSION "v2.12.0b"
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
# Build time options to avoid dpkg warnings and help with reproducible builds. # Build time options to avoid dpkg warnings and help with reproducible builds.
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ARG LANG=C.UTF-8 ARG LANG=C.UTF-8

1
docker/armv6/sqlite/Dockerfile
View File

@ -8,7 +8,6 @@ ENV VAULT_VERSION "v2.12.0b"
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
# Build time options to avoid dpkg warnings and help with reproducible builds. # Build time options to avoid dpkg warnings and help with reproducible builds.
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ARG LANG=C.UTF-8 ARG LANG=C.UTF-8

1
docker/armv7/mysql/Dockerfile
View File

@ -8,7 +8,6 @@ ENV VAULT_VERSION "v2.12.0b"
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
# Build time options to avoid dpkg warnings and help with reproducible builds. # Build time options to avoid dpkg warnings and help with reproducible builds.
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ARG LANG=C.UTF-8 ARG LANG=C.UTF-8

1
docker/armv7/sqlite/Dockerfile
View File

@ -8,7 +8,6 @@ ENV VAULT_VERSION "v2.12.0b"
ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz"
# Build time options to avoid dpkg warnings and help with reproducible builds. # Build time options to avoid dpkg warnings and help with reproducible builds.
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
ARG LANG=C.UTF-8 ARG LANG=C.UTF-8

Write Preview
Loading…
Cancel
Save