Skip to content

Commit 557858f

Browse files
Update Dockerfile
1 parent cb12e59 commit 557858f

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

.github/workflows/release.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ jobs:
1010
buildBinaries:
1111
name: Build and release binaries
1212
runs-on: ubuntu-latest
13-
if: github.ref == 'refs/heads/master'
1413
steps:
1514
- name: Check out code into the Go module directory
1615
uses: actions/checkout@v4
@@ -38,8 +37,10 @@ jobs:
3837
buildDockerImages:
3938
name: Build and push Docker Images
4039
runs-on: ubuntu-latest
41-
if: github.ref == 'refs/heads/master'
4240
steps:
41+
- name: Checkout
42+
uses: actions/checkout@v4
43+
4344
- name: Set up Docker Buildx
4445
uses: docker/setup-buildx-action@v3
4546

Dockerfile

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# First stage. Building a binary
22
# -----------------------------------------------------------------------------
3-
FROM golang:alpine AS builder
3+
FROM golang:1.22 AS builder
44

55
# Download the source code
6-
RUN apk update && apk add git
6+
RUN apt-get update && apt-get install -y git
77
RUN git clone https://github.com/marcelGoerentz/Threadfin.git /src
88

99
WORKDIR /src
@@ -16,7 +16,7 @@ RUN go build threadfin.go
1616

1717
# Second stage. Creating an image
1818
# -----------------------------------------------------------------------------
19-
FROM alpine:3.20
19+
FROM ubuntu:22.04
2020

2121
ARG BUILD_DATE
2222
ARG VCS_REF
@@ -26,9 +26,9 @@ ARG THREADFIN_VERSION
2626
LABEL org.label-schema.build-date="{$BUILD_DATE}" \
2727
org.label-schema.name="Threadfin" \
2828
org.label-schema.description="Dockerized Threadfin" \
29-
org.label-schema.url="https://hub.docker.com/r/fyb3roptik/threadfin/" \
29+
org.label-schema.url="https://hub.docker.com/r/marcelGoerentz/threadfin/" \
3030
org.label-schema.vcs-ref="{$VCS_REF}" \
31-
org.label-schema.vcs-url="https://github.com/Threadfin/Threadfin" \
31+
org.label-schema.vcs-url="https://github.com/marcelGoerentz/Threadfin" \
3232
org.label-schema.vendor="Threadfin" \
3333
org.label-schema.version="{$THREADFIN_VERSION}" \
3434
org.label-schema.schema-version="1.0" \
@@ -53,14 +53,16 @@ ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$THREADFIN
5353
# Set working directory
5454
WORKDIR $THREADFIN_HOME
5555

56-
RUN apk update && apk upgrade
57-
RUN apk add ca-certificates\
56+
RUN rm /var/lib/dpkg/info/libc-bin.*
57+
RUN apt-get clean
58+
RUN apt-get install libc-bin
59+
RUN apt-get update && apt-get upgrade
60+
RUN apt-get install -y ca-certificates\
5861
curl\
5962
ffmpeg\
6063
vlc
6164

62-
#RUN DEBIAN_FRONTEND=noninteractive TZ="America/New_York" apt-get -y install tzdata
63-
RUN DEBIAN_FRONTEND=noninteractive TZ="America/New_York" apk add tzdata
65+
RUN DEBIAN_FRONTEND=noninteractive TZ="America/New_York" apt-get -y install tzdata
6466

6567
RUN mkdir -p $THREADFIN_BIN
6668

0 commit comments

Comments
 (0)