Skip to content

Commit

Permalink
chore: 1.12
Browse files Browse the repository at this point in the history
  • Loading branch information
M0Rf30 committed Feb 23, 2025
1 parent 424ad3f commit bd1f606
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 32 deletions.
31 changes: 16 additions & 15 deletions build/deploy/rocky-8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ LABEL org.opencontainers.image.vendor="M0Rf30"

SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN \
dnf -y install curl tar; \
curl -sL https://go.dev/dl/go1.23.6.linux-amd64.tar.gz --output go.tar.gz; \
echo "9379441ea310de000f33a4dc767bd966e72ab2826270e038e78b2c53c2e7802d go.tar.gz" | sha256sum -c - ; \
tar -C /usr/lib -xf go.tar.gz; \
ln -sf /usr/lib/go/bin/go /usr/bin/go; \
ln -sf /usr/lib/go/bin/gofmt /usr/bin/gofmt; \
ln -sf /usr/share/doc/go /usr/lib/go/doc; \
dnf clean all
dnf -y install curl tar; \
curl -sL https://go.dev/dl/go1.23.6.linux-amd64.tar.gz --output go.tar.gz; \
echo "9379441ea310de000f33a4dc767bd966e72ab2826270e038e78b2c53c2e7802d go.tar.gz" | sha256sum -c - ; \
tar -C /usr/lib -xf go.tar.gz; \
ln -sf /usr/lib/go/bin/go /usr/bin/go; \
ln -sf /usr/lib/go/bin/gofmt /usr/bin/gofmt; \
ln -sf /usr/share/doc/go /usr/lib/go/doc; \
dnf clean all

COPY . /project
WORKDIR /project
RUN \
CGO_ENABLED=0 \
CGO_ENABLED=0 \
go build \
-buildvcs=false \
-ldflags "-w -s" \
Expand All @@ -27,17 +27,18 @@ RUN \
FROM docker.io/rockylinux/rockylinux:8
COPY --from=builder /usr/bin/yap /usr/bin/yap
RUN \
dnf -y install \
dnf -y install \
bash-completion \
ca-certificates \
dnf-plugins-core \
epel-release \
rpm-build \
sudo; \
dnf config-manager --enable devel; \
dnf config-manager --enable powertools; \
yap completion bash > /etc/bash_completion.d/yap; \
echo "source /usr/share/bash-completion/bash_completion" >> /etc/bashrc; \
dnf clean all
dnf config-manager --enable devel; \
dnf config-manager --enable powertools; \
yap completion bash > /etc/bash_completion.d/yap; \
echo "source /usr/share/bash-completion/bash_completion" >> /etc/bashrc; \
dnf clean all

ENV GOROOT=/usr/lib/go
ENV PATH /usr/lib/go/bin:$PATH:/go/bin
Expand Down
32 changes: 17 additions & 15 deletions build/deploy/rocky-9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ LABEL org.opencontainers.image.vendor="M0Rf30"

SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN \
dnf -y install curl-minimal tar; \
curl -sL https://go.dev/dl/go1.23.6.linux-amd64.tar.gz --output go.tar.gz; \
echo "9379441ea310de000f33a4dc767bd966e72ab2826270e038e78b2c53c2e7802d go.tar.gz" | sha256sum -c - ; \
tar -C /usr/lib -xf go.tar.gz; \
ln -sf /usr/lib/go/bin/go /usr/bin/go; \
ln -sf /usr/lib/go/bin/gofmt /usr/bin/gofmt; \
ln -sf /usr/share/doc/go /usr/lib/go/doc; \
dnf clean all
dnf -y install curl-minimal tar; \
curl -sL https://go.dev/dl/go1.23.6.linux-amd64.tar.gz --output go.tar.gz; \
echo "9379441ea310de000f33a4dc767bd966e72ab2826270e038e78b2c53c2e7802d go.tar.gz" | sha256sum -c - ; \
tar -C /usr/lib -xf go.tar.gz; \
ln -sf /usr/lib/go/bin/go /usr/bin/go; \
ln -sf /usr/lib/go/bin/gofmt /usr/bin/gofmt; \
ln -sf /usr/share/doc/go /usr/lib/go/doc; \
dnf clean all

COPY . /project
WORKDIR /project
RUN \
CGO_ENABLED=0 \
CGO_ENABLED=0 \
go build \
-buildvcs=false \
-ldflags "-w -s" \
Expand All @@ -27,17 +27,19 @@ RUN \
FROM docker.io/rockylinux/rockylinux:9
COPY --from=builder /usr/bin/yap /usr/bin/yap
RUN \
dnf -y install \
dnf -y install \
bash-completion \
ca-certificates \
dnf-plugins-core \
epel-release \
rpm-build \
sudo; \
dnf config-manager --enable crb; \
dnf config-manager --enable devel; \
yap completion bash > /etc/bash_completion.d/yap; \
echo "source /usr/share/bash-completion/bash_completion" >> /etc/bashrc; \
dnf clean all
dnf config-manager --enable appstream; \
dnf config-manager --enable crb; \
dnf config-manager --enable devel; \
yap completion bash > /etc/bash_completion.d/yap; \
echo "source /usr/share/bash-completion/bash_completion" >> /etc/bashrc; \
dnf clean all

ENV GOROOT=/usr/lib/go
ENV PATH /usr/lib/go/bin:$PATH:/go/bin
Expand Down
2 changes: 1 addition & 1 deletion cmd/yap/command/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var versionCmd = &cobra.Command{
pterm.DefaultCenter.Print(
pterm.DefaultHeader.WithFullWidth().WithMargin(10).Sprint("Yet Another Packager"))

pterm.Println("Version v1.11")
pterm.Println("Version v1.12")
pterm.Println("Coded with \u2764 by M0Rf30")
},
}
Expand Down
2 changes: 1 addition & 1 deletion examples/yap/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pkgname=yap
pkgver=1.11
pkgver=1.12
pkgrel=1
pkgdesc="Package software with ease"
pkgdesc__alpine="Package software with ease for Alpine"
Expand Down

0 comments on commit bd1f606

Please sign in to comment.