Skip to content

Commit

Permalink
Removed Istio specific images as they are no longer needed
Browse files Browse the repository at this point in the history
scuttle is no longer needed with

proxy.istio.io/config: '{ "holdApplicationUntilProxyStarts": true }'
  • Loading branch information
robklg committed Dec 15, 2024
1 parent 205fc0a commit 4492044
Show file tree
Hide file tree
Showing 12 changed files with 8 additions and 112 deletions.
16 changes: 0 additions & 16 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -363,26 +363,10 @@ jobs:
push: true
tags: bolcom/unftp:${{ env.BUILD_VERSION }}-alpine

- name: Build and push alpine-istio image
uses: docker/build-push-action@v2
with:
context: .
file: ./packaging/docker/alpine-istio.Dockerfile.ci
push: true
tags: bolcom/unftp:${{ env.BUILD_VERSION }}-alpine-istio

- name: Build and push alpine-debug image
uses: docker/build-push-action@v2
with:
context: .
file: ./packaging/docker/alpine-debug.Dockerfile.ci
push: true
tags: bolcom/unftp:${{ env.BUILD_VERSION }}-alpine-debug

- name: Build and push Scratch image
uses: docker/build-push-action@v2
with:
context: .
file: ./packaging/docker/alpine-istio-debug.Dockerfile.ci
push: true
tags: bolcom/unftp:${{ env.BUILD_VERSION }}-alpine-istio-debug
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- [#196](https://github.com/bolcom/unFTP/pull/196) --auth-type is now mandatory to prevent security risks from omission or typos that could leave the FTP server open
- Upgraded dependencies
- Upgraded to Rust 1.83.0
- Removed istio (scuttle) image build in favor of using `proxy.istio.io/config: '{ "holdApplicationUntilProxyStarts": true }'`

## 2023-12-24 unftp v0.14.7

Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ We offer 3 different options for building an unFTP docker image:
- `scratch`: builds the binary in [rust:slim](https://hub.docker.com/_/rust) and deploys in a `FROM scratch` image. The unFTP binary is statically linked using [musl libc](https://www.musl-libc.org/).
- `alpine` (default): builds in [rust:slim](https://hub.docker.com/_/rust) and deploy in alpine. This image is built with musl instead of a full-blown libc. The unFTP binary is statically linked using [musl libc](https://www.musl-libc.org/).
- `alpine-debug`: same images as `alpine` but using the debug build of unftp and adds tools like [lftp](https://lftp.yar.ru/) and [CurlFtpFS](http://curlftpfs.sourceforge.net/) while also running as root.
- `alpine-istio`: same as `alpine` but with [scuttle](https://github.com/redboxllc/scuttle) installed. For use together with [Istio](https://istio.io/).
- `alpine-istio-debug`: same as alpine-debug but with the additions of `alpine-istio`.

To build the alpine docker image:

Expand Down
2 changes: 2 additions & 0 deletions RELEASE-CHECKLIST.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Release Checklist

* Update the Rust version in the Makefile and the Github actions file
* Update the Rust version in packaging/docker/*.ci
* Update the alpine version in the packaging/docker/alpine.Dockerfile.ci image
* Update minor versions dependencies. Install [cargo-edit](https://crates.io/crates/cargo-edit) and run `cargo upgrade`.
Cargo-edit also covers all the crates in the workspace
* Update Cargo.toml with the new version number (also check for libunftp version references)
Expand Down
26 changes: 0 additions & 26 deletions alpine-istio-debug.Dockerfile.template

This file was deleted.

26 changes: 0 additions & 26 deletions alpine-istio.Dockerfile.template

This file was deleted.

1 change: 0 additions & 1 deletion docs/server/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ You can download pre-made docker images from [docker hub](https://hub.docker.com

```sh
docker pull bolcom/unftp:v0.14.7-alpine
docker pull bolcom/unftp:v0.14.7-alpine-istio
docker pull bolcom/unftp:v0.14.7-scratch
```

Expand Down
6 changes: 3 additions & 3 deletions packaging/docker/alpine-debug.Dockerfile.ci
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM rust:1.70.0-slim AS builder
FROM rust:1.83.0-slim AS builder

FROM alpine:3.17
FROM alpine:3.21

# for devel only
RUN apk add --repository http://dl-cdn.alpinelinux.org/alpine/v3.17/main fuse lftp curl
RUN apk add --repository http://dl-cdn.alpinelinux.org/alpine/v3.21/main fuse lftp curl
RUN apk add --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing curlftpfs

# we could also RUN 'apk add ca-certificates', but we prefer to be consistent with the -minimal image
Expand Down
18 changes: 0 additions & 18 deletions packaging/docker/alpine-istio-debug.Dockerfile.ci

This file was deleted.

18 changes: 0 additions & 18 deletions packaging/docker/alpine-istio.Dockerfile.ci

This file was deleted.

2 changes: 1 addition & 1 deletion packaging/docker/alpine.Dockerfile.ci
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.70.0-slim AS builder
FROM rust:1.83.0-slim AS builder

FROM alpine:latest

Expand Down
2 changes: 1 addition & 1 deletion packaging/docker/scratch.Dockerfile.ci
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.70.0-slim AS builder
FROM rust:1.83.0-slim AS builder

FROM scratch

Expand Down

0 comments on commit 4492044

Please sign in to comment.