@@ -7,16 +7,20 @@ ENV TARGETARCH=${TARGETARCH}
77ARG ASDF_VERSION
88COPY .tool-versions.asdf /tmp/.tool-versions.asdf
99
10+
11+ RUN if [ "$TARGETARCH" = "arm64" ] || [ "$TARGETARCH" = "aarch64" ]; then dpkg --add-architecture arm64; fi
12+
1013# System updates
1114RUN apt-get update \
1215 && export DEBIAN_FRONTEND=noninteractive \
1316 && apt-get -y dist-upgrade \
14- && apt-get -y install --no-install-recommends \
15- git make
16-
17- # Python dependencies
18- RUN apt-get -y install --no-install-recommends \
19- libffi-dev libsqlite3-dev
17+ && apt-get -y install --no-install-recommends htop vim curl git build-essential \
18+ libffi-dev libssl-dev libxml2-dev libxslt1-dev libjpeg8-dev libbz2-dev \
19+ zlib1g-dev unixodbc unixodbc-dev libsecret-1-0 libsecret-1-dev libsqlite3-dev \
20+ jq apt-transport-https ca-certificates gnupg-agent \
21+ software-properties-common bash-completion python3-pip make \
22+ libreadline-dev libsqlite3-dev wget llvm libncurses5-dev libncursesw5-dev \
23+ xz-utils tk-dev liblzma-dev netcat-traditional libyaml-dev
2024
2125# Download correct AWS CLI for arch
2226RUN if [ "$TARGETARCH" = "arm64" ] || [ "$TARGETARCH" == "aarch64" ]; then \
@@ -40,9 +44,16 @@ RUN if [ "$TARGETARCH" = "arm64" ] || [ "$TARGETARCH" == "aarch64" ]; then \
4044
4145# Install ASDF
4246RUN ASDF_VERSION=$(awk '!/^#/ && NF {print $1; exit}' /tmp/.tool-versions.asdf) && \
43- wget -O /tmp/asdf.tar.gz https://github.com/asdf-vm/asdf/releases/download/v${ASDF_VERSION}/asdf-v${ASDF_VERSION}-linux-amd64.tar.gz; \
44- tar -xvzf /tmp/asdf.tar.gz; \
45- mv asdf /usr/bin
47+ if [ "$TARGETARCH" = "arm64" ] || [ "$TARGETARCH" == "aarch64" ]; then \
48+ wget -O /tmp/asdf.tar.gz "https://github.com/asdf-vm/asdf/releases/download/v${ASDF_VERSION}/asdf-v${ASDF_VERSION}-linux-arm64.tar.gz" ; \
49+ else \
50+ wget -O /tmp/asdf.tar.gz "https://github.com/asdf-vm/asdf/releases/download/v${ASDF_VERSION}/asdf-v${ASDF_VERSION}-linux-amd64.tar.gz" ; \
51+ fi && \
52+ tar -xzf /tmp/asdf.tar.gz -C /tmp && \
53+ mkdir -p /usr/bin && \
54+ mv /tmp/asdf /usr/bin/asdf && \
55+ chmod +x /usr/bin/asdf && \
56+ rm -rf /tmp/asdf.tar.gz
4657
4758USER vscode
4859
@@ -54,7 +65,7 @@ RUN asdf plugin add python; \
5465 asdf plugin add poetry https://github.com/asdf-community/asdf-poetry.git; \
5566 asdf plugin add shellcheck https://github.com/luizm/asdf-shellcheck.git; \
5667 asdf plugin add nodejs https://github.com/asdf-vm/asdf-nodejs.git; \
57- asdf plugin- add direnv; \
68+ asdf plugin add direnv; \
5869 asdf plugin add actionlint;
5970
6071WORKDIR /workspaces/nhs-eps-spine-client
0 commit comments