Skip to content

Commit 7cbce25

Browse files
committed
tools: drop dockerize, keep percona and aws cli
1 parent 70415f2 commit 7cbce25

1 file changed

Lines changed: 5 additions & 15 deletions

File tree

Dockerfile.tools

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,22 @@
33
# DataCite Canis Tools Image
44
#
55
# Builds on top of the slim canis-base and adds heavy operational tooling.
6-
# This image is intended primarily for Lupo and any services that might/will need
7-
# Percona Toolkit and AWS CLI at runtime.
6+
# Intended mainly for Lupo (Percona Toolkit + AWS CLI at runtime).
87

98
ARG BASE_IMAGE=ghcr.io/datacite/canis-base:latest
109
FROM ${BASE_IMAGE}
1110

1211
LABEL maintainer="support@datacite.org" \
1312
org.opencontainers.image.source="https://github.com/datacite/docker-canis-base" \
14-
org.opencontainers.image.description="DataCite Canis Base + Tools (Percona + AWS CLI + Dockerize + ...)"
15-
16-
ENV DOCKERIZE_VERSION=v0.6.0
13+
org.opencontainers.image.description="DataCite Canis Base + Tools (Percona + AWS CLI)"
1714

1815
# ============================================================================
1916
# Percona Toolkit 3.7.1 + Perl DBI libraries
2017
# ============================================================================
2118
RUN apt-get update && \
2219
apt-get install -y --no-install-recommends \
23-
libdbd-mysql-perl libdbi-perl libterm-readkey-perl libio-socket-ssl-perl && \
20+
libdbd-mysql-perl libdbi-perl libterm-readkey-perl libio-socket-ssl-perl \
21+
unzip && \
2422
wget -q https://downloads.percona.com/downloads/percona-toolkit/3.7.1/binary/debian/noble/x86_64/percona-toolkit_3.7.1-3.noble_amd64.deb -O /tmp/percona-toolkit.deb && \
2523
dpkg -i /tmp/percona-toolkit.deb || apt-get install -y -f --no-install-recommends && \
2624
rm -f /tmp/percona-toolkit.deb && \
@@ -32,14 +30,6 @@ RUN apt-get update && \
3230
RUN wget -q https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip -O /tmp/awscliv2.zip && \
3331
unzip -q /tmp/awscliv2.zip -d /tmp && \
3432
/tmp/aws/install && \
35-
rm -rf /tmp/awscliv2.zip /tmp/aws && \
36-
apt-get clean
37-
38-
# ============================================================================
39-
# dockerize (wait-for pattern used by some services)
40-
# ============================================================================
41-
RUN wget -q https://github.com/jwilder/dockerize/releases/download/${DOCKERIZE_VERSION}/dockerize-linux-amd64-${DOCKERIZE_VERSION}.tar.gz -O /tmp/dockerize.tar.gz && \
42-
tar -C /usr/local/bin -xzf /tmp/dockerize.tar.gz && \
43-
rm -f /tmp/dockerize.tar.gz
33+
rm -rf /tmp/awscliv2.zip /tmp/aws
4434

4535
WORKDIR /home/app/webapp

0 commit comments

Comments
 (0)