Skip to content

Commit 56a5d67

Browse files
committed
Fix workflow: lowercase image name, fix Dockerfile indentation
1 parent d79eec2 commit 56a5d67

1 file changed

Lines changed: 13 additions & 14 deletions

File tree

.github/workflows/build-engine.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
env:
1616
REGISTRY: ghcr.io
17-
IMAGE_NAME: ${{ github.repository_owner }}/mtproxymax-telemt
17+
IMAGE_NAME: mtproxymax-telemt
1818

1919
jobs:
2020
build:
@@ -39,28 +39,27 @@ jobs:
3939

4040
- name: Create Dockerfile
4141
run: |
42-
cat > Dockerfile << 'EOF'
42+
cat > Dockerfile <<'DEOF'
4343
FROM rust:1-bookworm AS builder
4444
ARG TELEMT_REPO=telemt/telemt
4545
ARG TELEMT_COMMIT
46-
RUN apt-get update && apt-get install -y --no-install-recommends git && \
47-
rm -rf /var/lib/apt/lists/*
46+
RUN apt-get update && apt-get install -y --no-install-recommends git && rm -rf /var/lib/apt/lists/*
4847
RUN git clone "https://github.com/${TELEMT_REPO}.git" /build
4948
WORKDIR /build
5049
RUN git checkout "${TELEMT_COMMIT}"
51-
RUN cargo build --release && \
52-
strip target/release/telemt 2>/dev/null || true && \
53-
cp target/release/telemt /telemt
54-
50+
RUN cargo build --release && strip target/release/telemt 2>/dev/null || true && cp target/release/telemt /telemt
5551
FROM debian:bookworm-slim
56-
RUN apt-get update && \
57-
apt-get install -y --no-install-recommends ca-certificates && \
58-
rm -rf /var/lib/apt/lists/*
52+
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates && rm -rf /var/lib/apt/lists/*
5953
COPY --from=builder /telemt /usr/local/bin/telemt
6054
RUN chmod +x /usr/local/bin/telemt
6155
STOPSIGNAL SIGINT
6256
ENTRYPOINT ["telemt"]
63-
EOF
57+
DEOF
58+
sed -i 's/^ //' Dockerfile
59+
60+
- name: Lowercase owner
61+
id: owner
62+
run: echo "name=$(echo '${{ github.repository_owner }}' | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_OUTPUT"
6463

6564
- name: Build and push multi-arch image
6665
uses: docker/build-push-action@v6
@@ -71,7 +70,7 @@ jobs:
7170
build-args: |
7271
TELEMT_COMMIT=${{ github.event.inputs.telemt_commit }}
7372
tags: |
74-
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.event.inputs.version_tag }}
75-
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
73+
${{ env.REGISTRY }}/${{ steps.owner.outputs.name }}/${{ env.IMAGE_NAME }}:${{ github.event.inputs.version_tag }}
74+
${{ env.REGISTRY }}/${{ steps.owner.outputs.name }}/${{ env.IMAGE_NAME }}:latest
7675
cache-from: type=gha
7776
cache-to: type=gha,mode=max

0 commit comments

Comments
 (0)