Skip to content

Bump Docker version to 2025.1.0 and use latest LTS Ubuntu version #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: containerise_v3_smallerimage
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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 \
Expand All @@ -39,4 +39,4 @@ RUN chmod -R +x /app

RUN mv entrypoint.sh /

ENTRYPOINT ["/entrypoint.sh"]
ENTRYPOINT ["/entrypoint.sh"]
4 changes: 2 additions & 2 deletions docker.build.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/update-bwdc.sh
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
echo "Bitwarden Directory Connector Version: " bwdc --version