Browse Source

Merge pull request #638 from mprasil/add_sqlite_binary

Add sqlite binary into the docker images
pull/644/head
Daniel García 6 years ago
committed by GitHub
parent
commit
e7b8602e1f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      docker/aarch64/sqlite/Dockerfile
  2. 1
      docker/amd64/postgresql/Dockerfile
  3. 1
      docker/amd64/postgresql/Dockerfile.alpine
  4. 1
      docker/amd64/sqlite/Dockerfile
  5. 1
      docker/amd64/sqlite/Dockerfile.alpine
  6. 1
      docker/armv6/sqlite/Dockerfile
  7. 1
      docker/armv7/sqlite/Dockerfile
  8. 2
      src/api/admin.rs

1
docker/aarch64/sqlite/Dockerfile

@ -82,6 +82,7 @@ RUN apt-get update && apt-get install -y \
openssl \ openssl \
ca-certificates \ ca-certificates \
curl \ curl \
sqlite3 \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN mkdir /data RUN mkdir /data

1
docker/amd64/postgresql/Dockerfile

@ -81,6 +81,7 @@ RUN apt-get update && apt-get install -y \
openssl \ openssl \
ca-certificates \ ca-certificates \
curl \ curl \
sqlite3 \
libpq5 \ libpq5 \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

1
docker/amd64/postgresql/Dockerfile.alpine

@ -64,6 +64,7 @@ RUN apk add --no-cache \
openssl \ openssl \
postgresql-libs \ postgresql-libs \
curl \ curl \
sqlite \
ca-certificates ca-certificates
RUN mkdir /data RUN mkdir /data

1
docker/amd64/sqlite/Dockerfile

@ -81,6 +81,7 @@ RUN apt-get update && apt-get install -y \
openssl \ openssl \
ca-certificates \ ca-certificates \
curl \ curl \
sqlite3 \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN mkdir /data RUN mkdir /data

1
docker/amd64/sqlite/Dockerfile.alpine

@ -63,6 +63,7 @@ ENV SSL_CERT_DIR=/etc/ssl/certs
RUN apk add --no-cache \ RUN apk add --no-cache \
openssl \ openssl \
curl \ curl \
sqlite \
ca-certificates ca-certificates
RUN mkdir /data RUN mkdir /data

1
docker/armv6/sqlite/Dockerfile

@ -82,6 +82,7 @@ RUN apt-get update && apt-get install -y \
openssl \ openssl \
ca-certificates \ ca-certificates \
curl \ curl \
sqlite3 \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN mkdir /data RUN mkdir /data

1
docker/armv7/sqlite/Dockerfile

@ -82,6 +82,7 @@ RUN apt-get update && apt-get install -y \
openssl \ openssl \
ca-certificates \ ca-certificates \
curl \ curl \
sqlite3 \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN mkdir /data RUN mkdir /data

2
src/api/admin.rs

@ -37,7 +37,7 @@ pub fn routes() -> Vec<Route> {
} }
lazy_static! { lazy_static! {
static ref CAN_BACKUP: bool = cfg!(feature = "sqlite") && Command::new("sqlite").arg("-version").status().is_ok(); static ref CAN_BACKUP: bool = cfg!(feature = "sqlite") && Command::new("sqlite3").arg("-version").status().is_ok();
} }
#[get("/")] #[get("/")]

Loading…
Cancel
Save