Skip to content

Commit

Permalink
Upgrade CrushFTP 11 v11.2.0_5
Browse files Browse the repository at this point in the history
  • Loading branch information
thohng committed Jun 27, 2024
1 parent f152747 commit b835a56
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/crushftp-source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: crushftp-source
runs-on: ubuntu-latest
env:
CRUSHFTP_VERSION: "10.8.0_4"
CRUSHFTP_VERSION: "11.2.0_5"
IS_TAG: ${{ startsWith(github.ref, 'refs/tags/') }}
SKIP_DOCKER: false
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-crushftp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
environment: development
env:
CRUSHFTP_VERSION: "10.8.0_4"
CRUSHFTP_VERSION: "11.2.0_5"
IS_TAG: ${{ startsWith(github.ref, 'refs/tags/') }}
IS_DEV: ${{ startsWith(github.ref, 'refs/heads/dev') }}
SKIP_DOCKER: false
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# CrushFTP 10
# CrushFTP 11

CrushFTP 10 Server provides FTP, Implicit FTPS, SFTP, HTTP, or HTTPS
CrushFTP 11 Server provides FTP, Implicit FTPS, SFTP, HTTP, or HTTPS

## Docker Specifications

- Base: Alpine 3.19 Linux, OpenJDK 17, `eclipse-temurin:17-jre-alpine`
- CrushFTP 10 (v10.8.0) (required commercial license [pricing](https://www.crushftp.com/pricing.html))
- CrushFTP 11 (v10.8.0) (required commercial license [pricing](https://www.crushftp.com/pricing.html))
- Dockerfile: https://github.com/NetLah/docker-crushftp

This container [hub.docker.com/r/netlah/crushftp](https://hub.docker.com/r/netlah/crushftp) is distributed under the [MIT Licence](LICENSE).
Expand Down Expand Up @@ -51,8 +51,8 @@ docker logs <container_id/container_name>

## References

- Visit the [CrushFTP 10 Wiki](https://www.crushftp.com/crush10wiki/)
- Docker sample [CrushFTP 10 Docker sample](https://www.crushftp.com/crush10wiki/Wiki.jsp?page=Docker)
- Visit the [CrushFTP 11 Wiki](https://www.crushftp.com/crush11wiki/)
- Docker sample [CrushFTP 11 Docker sample](https://www.crushftp.com/crush11wiki/Wiki.jsp?page=Docker)
- A [CrushFTP 10 Dockerization](https://github.com/MarkusMcNugen/docker-CrushFTP)
- Prebuilt OpenJDK by [Adoptium](https://adoptium.net/), project [Eclipse Temurin](https://adoptium.net/temurin/)
- Java docker [eclipse-temurin](https://hub.docker.com/_/eclipse-temurin)
25 changes: 14 additions & 11 deletions crushftp-source/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# alpine:3.19.1
# buildargs: REPO=alpine:3.19.1 CRUSHFTP_VERSION=10.8.0_4 SOURCE_METHOD=wget or add SOURCE_ZIP=https://www.crushftp.com/early10/CrushFTP10.zip
# buildargs: REPO=alpine:3.19.1 CRUSHFTP_VERSION=11.2.0_5 SOURCE_METHOD=wget or add SOURCE_ZIP=https://www.crushftp.com/early11/CrushFTP11.zip
ARG REPO=alpine:3.19.1
ARG SOURCE_METHOD=wget

Expand All @@ -11,29 +11,32 @@ RUN apk upgrade --no-cache \
WORKDIR /tmp

FROM base-source AS source-wget
# source CrushFTP10.zip without java included
ARG SOURCE_ZIP=https://www.crushftp.com/early10/CrushFTP10.zip
RUN wget -q -O CrushFTP10.zip $SOURCE_ZIP
# source CrushFTP11.zip without java included
ARG SOURCE_ZIP=https://www.crushftp.com/early11/CrushFTP11.zip
ARG CRUSHFTP_VER=CrushFTP11
RUN wget -q -O ${CRUSHFTP_VER}.zip $SOURCE_ZIP

FROM base-source AS source-add
# source CrushFTP10.zip without java included
ARG SOURCE_ZIP=https://www.crushftp.com/early10/CrushFTP10.zip
ADD $SOURCE_ZIP CrushFTP10.zip
# source CrushFTP11.zip without java included
ARG SOURCE_ZIP=https://www.crushftp.com/early11/CrushFTP11.zip
ARG CRUSHFTP_VER=CrushFTP11
ADD $SOURCE_ZIP ${CRUSHFTP_VER}.zip

FROM source-$SOURCE_METHOD AS zip
# unzip to destination /tmp/CrushFTP10
RUN unzip -oq CrushFTP10.zip
# unzip to destination /tmp/CrushFTP11
ARG CRUSHFTP_VER=CrushFTP11
RUN unzip -oq ${CRUSHFTP_VER}.zip
# create folder /src if not exist
WORKDIR /src
RUN cd /tmp/CrushFTP10 \
RUN cd /tmp/CRUSHFTP_VER \
&& zip -qr9 /src/crushftp.zip * \
&& date '+%F %T %z'>/src/__builddate.txt

FROM base as final
WORKDIR /src
COPY --from=zip /src .

ARG CRUSHFTP_VERSION=10.8.0_4
ARG CRUSHFTP_VERSION=11.2.0_5
ENV CRUSHFTP_VERSION=$CRUSHFTP_VERSION
LABEL org.opencontainers.image.authors="https://github.com/NetLah"\
org.opencontainers.image.url="https://hub.docker.com/r/netlah/crushftp-source"\
Expand Down
4 changes: 2 additions & 2 deletions crushftp-source/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# CrushFTP 10 Source
# CrushFTP 11 Source

This intermediate docker image contains crushftp.zip for next docker build image Crushftp server.

## Docker Specifications

- Base: Alpine 3.19 Linux
- CrushFTP 10 (v10.8.0_4)
- CrushFTP 11 (v11.2.0_5)
- Repository: [hub.docker.com/r/netlah/crushftp](hub.docker.com/r/netlah/crushftp)
- Docker: [hub.docker.com/r/netlah/crushftp-source](hub.docker.com/r/netlah/crushftp-source)

Expand Down
8 changes: 4 additions & 4 deletions crushftp/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# alpine:3.19.1
ARG REPO=eclipse-temurin:17-jre-alpine
ARG CRUSHFTP_VERSION=10.8.0_4
ARG CRUSHFTP_VERSION=11.2.0_5
ARG SOURCE=netlah/crushftp-source:$CRUSHFTP_VERSION
FROM $REPO AS base

Expand All @@ -12,7 +12,7 @@ ADD $STARTUP /src/var/opt/startup.sh
ADD service.sh /src/var/opt/service.sh
WORKDIR /src/tmp
COPY --from=src src/crushftp.zip .
ARG CRUSHFTP_VERSION=10.8.0_4
ARG CRUSHFTP_VERSION=11.2.0_5
RUN date '+%F %T %Z'>>__builddate.txt \
&& echo "CrushFTP Version = $CRUSHFTP_VERSION">>__version.txt \
&& echo "Build Date Time = `cat __builddate.txt`">>__version.txt \
Expand All @@ -30,7 +30,7 @@ RUN ln -s /var/opt/service.sh /usr/sbin/service \
&& chmod +x service.sh startup.sh
ENTRYPOINT [ "/bin/bash", "-c", "/var/opt/startup.sh" ]

ARG CRUSHFTP_VERSION=10.8.0_4
ARG CRUSHFTP_VERSION=11.2.0_5
ENV ADMIN_USER=crushadmin \
ADMIN_PASSWORD= \
WEB_PROTOCOL=http \
Expand All @@ -47,6 +47,6 @@ EXPOSE 21 2222 443 8080 9090
LABEL org.opencontainers.image.authors="https://github.com/NetLah" \
org.opencontainers.image.url="https://hub.docker.com/r/netlah/crushftp" \
org.opencontainers.image.source="https://github.com/NetLah/docker-crushftp" \
org.opencontainers.image.description="CrushFTP 10 server on Alpine Linux 3.19 and OpenJDK 17." \
org.opencontainers.image.description="CrushFTP 11 server on Alpine Linux 3.19 and OpenJDK 17." \
org.opencontainers.image.version="$CRUSHFTP_VERSION"\
version="$CRUSHFTP_VERSION"
10 changes: 5 additions & 5 deletions crushftp/startup.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
cat >/etc/motd <<EOL
___ _ ___ _____ ___ _ __
/ __|_ _ _ _ __| |_ | __|_ _| _ \ / |/ \
| (__| '_| || (_-< ' \| _| | | | _/ | | () |
\___|_| \_,_/__/_||_|_| |_| |_| |_|\__/
___ _ ___ _____ ___ _ _
/ __|_ _ _ _ __| |_ | __|_ _| _ \ / | / |
| (__| '_| || (_-< ' \| _| | | | _/ | | | |
\___|_| \_,_/__/_||_|_| |_| |_| |_| |_|
CrushFTP 10, $(source /etc/os-release;echo $PRETTY_NAME)
CrushFTP 11, $(source /etc/os-release;echo $PRETTY_NAME)
$(java -version 2>&1)
Build Time: `cat /tmp/__builddate.txt`
Start Time: `date '+%F %T %Z'`
Expand Down

0 comments on commit b835a56

Please sign in to comment.