From 29a27dc4bb938317e3e5ea6531e94a13461543ed Mon Sep 17 00:00:00 2001 From: Daniel Stratton Date: Wed, 11 Jan 2023 10:06:19 +1000 Subject: [PATCH] Remove heredocs dependency to increase compatibility --- Dockerfile | 8 +------- docker/.gitattributes | 1 + docker/run.sh | 3 +++ 3 files changed, 5 insertions(+), 7 deletions(-) create mode 100644 docker/.gitattributes create mode 100644 docker/run.sh diff --git a/Dockerfile b/Dockerfile index 323e13ec6..5a0a88b09 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,3 @@ -#syntax = docker/dockerfile:1.4.0 - FROM quay.io/centos/centos:stream AS buildbase RUN yum -y install tar unzip glibc.i686 gcc dos2unix cmake gcc-c++ && yum clean all && rm -rf /var/cache/yum RUN mkdir -p ~/uox3 @@ -20,10 +18,6 @@ WORKDIR /home/uox3/app COPY --from=buildapp --chown=uox3 /root/uox3/uox3 . COPY --chown=uox3 data data/ COPY --chown=uox3 docs docs/ -RUN <> ~/app/run.sh -#!/usr/bin/env bash -cd ~/app -./uox3 data/uox.ini -EOF +COPY --chown=uox3 docker/run.sh . RUN chmod 777 /home/uox3/app/run.sh && dos2unix /home/uox3/app/run.sh CMD ["/home/uox3/app/run.sh"] \ No newline at end of file diff --git a/docker/.gitattributes b/docker/.gitattributes new file mode 100644 index 000000000..526c8a38d --- /dev/null +++ b/docker/.gitattributes @@ -0,0 +1 @@ +*.sh text eol=lf \ No newline at end of file diff --git a/docker/run.sh b/docker/run.sh new file mode 100644 index 000000000..a65456daf --- /dev/null +++ b/docker/run.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +cd ~/app +./uox3 data/uox.ini