From 77f4efb9b75d87d6fa820895edede6877b36cfeb Mon Sep 17 00:00:00 2001
From: Chris Coley <chris@codingallnight.com>
Date: Sun, 20 Apr 2025 14:05:37 -0700
Subject: [PATCH] Remove HEREDOC from Dockerfile since Kaniko doesn't support
it
See https://github.com/GoogleContainerTools/kaniko/issues/1713
---
.gitlab-ci.yml | 2 +-
Dockerfile | 11 +----------
entrypoint.sh | 9 +++++++++
3 files changed, 11 insertions(+), 11 deletions(-)
create mode 100644 entrypoint.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7ac6a4..1e4f9ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -94,7 +94,7 @@ release:latest:
release:python2.7:
extends: .release
needs: ['test:python2.7']
- script:
+ script:
- crane tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}-2.16 2.16
- crane tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}-2.16 python3.6
- crane tag ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}-2.16 python2.7
diff --git a/Dockerfile b/Dockerfile
index 9979db1..ab28956 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,16 +9,7 @@ RUN apk add --update --no-cache \
ansible ansible-core~=${ANSIBLE_VERSION}
# Add entrypoint script
-COPY <<EOF /entrypoint.sh
-#!/bin/sh
-set -e
-
-cp -R /tmp/.ssh /root/.ssh
-chown -R root:root /root/.ssh
-
-exec "\$@"
-EOF
-
+COPY entrypoint.sh /
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
diff --git a/entrypoint.sh b/entrypoint.sh
new file mode 100644
index 0000000..2ac80a8
--- /dev/null
+++ b/entrypoint.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+cp -R /tmp/.ssh /root/.ssh
+chown -R root:root /root/.ssh
+
+exec "$@"
+
+# vi: set ts=4 sw=4 et ft=sh:
--
GitLab