diff --git a/Dockerfile b/Dockerfile index 68a371c..058f2bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,17 @@ -FROM golang:alpine +FROM golang:latest AS build -RUN apk update +COPY . /opt/build -RUN apk add --update make py3-pip curl sed npm build-base python3-dev +RUN apt update -y \ + && apt install build-essential python3-pip curl software-properties-common sed -y \ + && (curl -sL https://deb.nodesource.com/setup_14.x | bash -) \ + && apt install nodejs \ + && (cd /opt/build; make headless) \ + && sed -i 's#id="pwrJfPath" placeholder="Folder"#id="pwrJfPath" value="/jf" disabled#g' /opt/build/build/data/templates/setup.html -ADD . / /opt/build/ +FROM golang:latest -RUN (cd /opt/build; make headless) - -RUN mv /opt/build/build /opt/jfa-go - -RUN rm -rf /opt/build - -RUN sed -i 's#id="pwrJfPath" placeholder="Folder"#id="pwrJfPath" value="/jf" disabled#g' /opt/jfa-go/data/templates/setup.html - -RUN apk del py3-pip python3-dev build-base python3 nodejs npm - -RUN (rm -rf /go; rm -rf /usr/local/go) +COPY --from=build /opt/build/build /opt/jfa-go EXPOSE 8056 diff --git a/dockerfile-debian b/dockerfile-debian deleted file mode 100644 index 979705e..0000000 --- a/dockerfile-debian +++ /dev/null @@ -1,33 +0,0 @@ -FROM golang:latest - -RUN apt update -y - -RUN apt install build-essential python3-pip curl software-properties-common sed -y - -RUN (curl -sL https://deb.nodesource.com/setup_14.x | bash -) - -RUN apt install nodejs - -ADD . / /opt/build/ - -RUN (cd /opt/build; make headless) - -RUN mv /opt/build/build /opt/jfa-go - -RUN rm -rf /opt/build - -RUN sed -i 's#id="pwrJfPath" placeholder="Folder"#id="pwrJfPath" value="/jf" disabled#g' /opt/jfa-go/data/templates/setup.html - -RUN apt remove python3-pip python3 nodejs -y - -RUN apt purge python3-minimal nodejs -y - -RUN apt autoremove -y - -RUN rm -rf /usr/local/go /go - -EXPOSE 8056 - -CMD [ "/opt/jfa-go/jfa-go", "-data", "/data" ] - -