diff --git a/Dockerfile b/Dockerfile index b6cdd19db..e5c927ca3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu:20.04 -# Gallium: v16 and lts -# bullseye: Debian Stable +FROM ubuntu:24.04 +# jod: v22 and lts +# bookworm: Debian Stable LABEL com.bitwarden.product="bitwarden" @@ -13,7 +13,7 @@ ENV BITWARDENCLI_CONNECTOR_PLAINTEXT_SECRETS=true WORKDIR /app ENV PATH="/app:${PATH}" -ARG BWDC_VERSION=2.9.10 +ARG BWDC_VERSION=2025.1.0 ENV BWDC_VERSION=${BWDC_VERSION} RUN apt-get update \ @@ -39,4 +39,4 @@ RUN chmod -R +x /app RUN mv entrypoint.sh / -ENTRYPOINT ["/entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["/entrypoint.sh"] diff --git a/docker.build.sh b/docker.build.sh index d8c5a4db1..7834c60a3 100755 --- a/docker.build.sh +++ b/docker.build.sh @@ -1,8 +1,8 @@ #!/bin/bash set -e -BWDC_VERSION=2.9.10 -export BUILD_TAG=bitwarden/directory-connector:${BWDC_VERSION}-containerise_v3.0.1 +BWDC_VERSION=2025.1.0 +export BUILD_TAG=bitwarden/directory-connector:${BWDC_VERSION}-containerise_v3.0.2 DOCKER_BUILDKIT=1 docker build --progress=plain . --label com.bitwarden.product="bitwarden" --build-arg BWDC_VERSION -t ${BUILD_TAG} --rm #--no-cache # --squash --pull diff --git a/dockerfiles/update-bwdc.sh b/dockerfiles/update-bwdc.sh index e5c200f3b..0dd877dbc 100755 --- a/dockerfiles/update-bwdc.sh +++ b/dockerfiles/update-bwdc.sh @@ -1,6 +1,6 @@ #!/bin/bash -BWDC_VERSION=2.9.10 +BWDC_VERSION=2025.1.0 echo "Work in progress, not executable yet! Exiting..." exit @@ -13,4 +13,4 @@ curl -Lo bwdc-linux.zip \ unzip bwdc-linux.zip rm bwdc-linux.zip chmod 700 bwdc && chmod 700 keytar.node -echo "Bitwarden Directory Connector Version: " bwdc --version \ No newline at end of file +echo "Bitwarden Directory Connector Version: " bwdc --version