From f041fcfc3d9b75838a6d78f63496d679ff4320ea Mon Sep 17 00:00:00 2001 From: Yannick Scherer Date: Wed, 18 Oct 2023 12:54:49 +0200 Subject: [PATCH 1/2] Use version 1.1.7 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 28a66ee..051034e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,5 +3,5 @@ RUN mkdir /dist && mkdir -p /var/tmp COPY download.sh /dist/download.sh COPY entrypoint.sh /dist/entrypoint.sh -ENV DEFAULT_VERSION="1.1.5" +ENV DEFAULT_VERSION="1.1.7" ENTRYPOINT [ "/dist/entrypoint.sh" ] From 1615a9612734d71467257d81fa4f22859b550dc2 Mon Sep 17 00:00:00 2001 From: Yannick Scherer Date: Wed, 18 Oct 2023 13:50:45 +0200 Subject: [PATCH 2/2] Use 'ubuntu:jammy' as base image --- Dockerfile | 3 ++- download.sh | 4 ++-- entrypoint.sh | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 051034e..86c5590 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM busybox:glibc +FROM ubuntu:jammy +RUN apt-get update && apt-get install -y curl unzip RUN mkdir /dist && mkdir -p /var/tmp COPY download.sh /dist/download.sh COPY entrypoint.sh /dist/entrypoint.sh diff --git a/download.sh b/download.sh index cae2cdd..435400a 100755 --- a/download.sh +++ b/download.sh @@ -7,7 +7,7 @@ VERSION="$1" if [ -z "$VERSION" ]; then VERSION="${DEFAULT_VERSION:-1.0.0}"; fi FILE="/dist/into-${VERSION}.zip" -URL="https://github.com/into-docker/into-docker/releases/download/v${VERSION}/into-${VERSION}-linux-amd64-static.zip" -wget -O "$FILE" "$URL" +URL="https://github.com/into-docker/into-docker/releases/download/v${VERSION}/into-${VERSION}-linux-amd64.zip" +curl -L "$URL" > "$FILE" echo "$FILE" diff --git a/entrypoint.sh b/entrypoint.sh index 156018b..2a95426 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/sh -l +#!/bin/bash -l set -eu