Skip to content

Commit 76ffa9d

Browse files
committed
Update docker labels, go deps
1 parent 76997c0 commit 76ffa9d

6 files changed

Lines changed: 43 additions & 30 deletions

File tree

Dockerfile

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
ARG BUILD_FROM_PREFIX
55

6-
FROM ${BUILD_FROM_PREFIX}golang:alpine3.22 AS builder
6+
FROM ${BUILD_FROM_PREFIX}golang:alpine AS builder
77
COPY .gitignore /usr/bin/
88
RUN apk --no-cache add gcc musl-dev git
99
WORKDIR /go/src/
@@ -23,7 +23,7 @@ RUN export GOPROXY=direct \
2323
-ldflags '-s -w -X main.ver=${BUILD_VERSION} \
2424
-X main.commit=${BUILD_REF} -X main.date=${BUILD_DATE}' -o /app
2525

26-
FROM alpine:3.22 AS libs
26+
FROM alpine AS libs
2727
RUN apk --no-cache add ca-certificates
2828

2929
FROM scratch
@@ -38,7 +38,6 @@ ARG BUILD_DATE
3838
ARG BUILD_REF
3939
LABEL maintainer="Patrick Domack (patrickdk@patrickdk.com)" \
4040
Description="aws s3 proxy." \
41-
ForkedFrom="" \
4241
org.label-schema.schema-version="1.0" \
4342
org.label-schema.build-date="${BUILD_DATE}" \
4443
org.label-schema.name="aws-s3-proxy" \
@@ -47,5 +46,16 @@ LABEL maintainer="Patrick Domack (patrickdk@patrickdk.com)" \
4746
org.label-schema.usage="https://github.com/patrickdk77/aws-s3-proxy/tree/master/README.md" \
4847
org.label-schema.vcs-url="https://github.com/patrickdk77/aws-s3-proxy" \
4948
org.label-schema.vcs-ref="${BUILD_REF}" \
50-
org.label-schema.version="${BUILD_VERSION}"
51-
49+
org.label-schema.version="${BUILD_VERSION}" \
50+
org.opencontainers.url="https://github.com/patrickdk77/aws-s3-proxy" \
51+
org.opencontainers.documentation="https://github.com/patrickdk77/aws-s3-proxy/tree/master/README.md" \
52+
org.opencontainers.source="https://github.com/patrickdk77/aws-s3-proxy" \
53+
org.opencontainers.revision="${BUILD_REF}" \
54+
org.opencontainers.image.authors="Patrick Domack (patrickdk@patrickdk.com)" \
55+
org.opencontainers.image.created="${BUILD_DATE}" \
56+
org.opencontainers.image.title="aws-s3-proxy" \
57+
org.opencontainers.image.description="AWS S3 Proxy with indexing" \
58+
org.opencontainers.image.version="${BUILD_VERSION}" \
59+
org.opencontainers.image.licenses="MIT" \
60+
org.opencontainers.image.ref.name="aws-s3-proxy" \
61+
version="${BUILD_VERSION}"

LICENSE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
The MIT License (MIT)
22

33
Copyright (c) 2016 Ryo Nakamaru
4+
Copyright (c) 2025 Patrick Domack
45

56
Permission is hereby granted, free of charge, to any person obtaining a copy
67
of this software and associated documentation files (the "Software"), to deal

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ all: buildx
2626

2727
buildx:
2828
docker buildx build --pull --push \
29-
--platform linux/amd64,linux/arm64 \
29+
--platform linux/amd64,linux/arm64 \
3030
--build-arg BUILD_GOOS=linux \
3131
--build-arg BUILD_DATE=${BUILD_DATE} \
3232
--build-arg BUILD_REF=${GIT_SHORT_SHA1} \
@@ -57,11 +57,11 @@ release-publish:
5757
./hooks/push
5858

5959
update:
60-
GOPROXY=direct go get -u
61-
GOPROXY=direct go mod tidy
60+
GOPROXY=direct go get -u
61+
GOPROXY=direct go mod tidy
6262

6363
deps:
64-
GOPROXY=direct go mod vendor
64+
GOPROXY=direct go mod vendor
6565
# @docker run --rm -it -e GOPROXY=direct -v "${PWD}:/go/src/github.com/patrickdk77/aws-s3-proxy/" \
6666
# -w /go/src/github.com/patrickdk77/aws-s3-proxy/ \
6767
# golang:alpine3.21 sh -c 'apk --no-cache add git && go mod vendor'
@@ -78,7 +78,7 @@ down:
7878
test:
7979
@docker run --rm -it -v "${PWD}:/go/src/github.com/patrickdk77/aws-s3-proxy/" \
8080
-w /go/src/github.com/patrickdk77/aws-s3-proxy/ \
81-
golangci/golangci-lint:latest-alpine \
81+
golangci/golangci-lint:latest-alpine \
8282
golangci-lint run --config .golangci.yml
8383
@docker run --rm -it -v "${PWD}:/go/src/github.com/patrickdk77/aws-s3-proxy/" \
8484
-w /go/src/github.com/patrickdk77/aws-s3-proxy/ \

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,4 @@ proxy:
9999

100100
## Copyright and license
101101

102-
Code released under the [MIT license](https://github.com/pottava/aws-s3-proxy/blob/master/LICENSE).
102+
Code released under the [MIT license](https://github.com/patrickdk77/aws-s3-proxy/blob/master/LICENSE).

go.mod

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module github.com/patrickdk77/aws-s3-proxy
22

3-
go 1.24.2
3+
go 1.25
44

55
require (
6-
github.com/aws/aws-sdk-go v1.55.7
6+
github.com/aws/aws-sdk-go v1.55.8
77
github.com/go-openapi/swag v0.23.1
88
github.com/golang-jwt/jwt/v4 v4.5.2
9-
github.com/prometheus/client_golang v1.22.0
9+
github.com/prometheus/client_golang v1.23.0
1010
github.com/stretchr/testify v1.10.0
1111
)
1212

@@ -20,9 +20,9 @@ require (
2020
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
2121
github.com/pmezard/go-difflib v1.0.0 // indirect
2222
github.com/prometheus/client_model v0.6.2 // indirect
23-
github.com/prometheus/common v0.64.0 // indirect
24-
github.com/prometheus/procfs v0.16.1 // indirect
25-
golang.org/x/sys v0.33.0 // indirect
26-
google.golang.org/protobuf v1.36.6 // indirect
23+
github.com/prometheus/common v0.65.0 // indirect
24+
github.com/prometheus/procfs v0.17.0 // indirect
25+
golang.org/x/sys v0.35.0 // indirect
26+
google.golang.org/protobuf v1.36.8 // indirect
2727
gopkg.in/yaml.v3 v3.0.1 // indirect
2828
)

go.sum

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
github.com/aws/aws-sdk-go v1.55.7 h1:UJrkFq7es5CShfBwlWAC8DA077vp8PyVbQd3lqLiztE=
2-
github.com/aws/aws-sdk-go v1.55.7/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU=
1+
github.com/aws/aws-sdk-go v1.55.8 h1:JRmEUbU52aJQZ2AjX4q4Wu7t4uZjOu71uyNmaWlUkJQ=
2+
github.com/aws/aws-sdk-go v1.55.8/go.mod h1:ZkViS9AqA6otK+JBBNH2++sx1sgxrPKcSzPPvQkUtXk=
33
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
44
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
55
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
@@ -33,23 +33,25 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
3333
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
3434
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
3535
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
36-
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
37-
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
36+
github.com/prometheus/client_golang v1.23.0 h1:ust4zpdl9r4trLY/gSjlm07PuiBq2ynaXXlptpfy8Uc=
37+
github.com/prometheus/client_golang v1.23.0/go.mod h1:i/o0R9ByOnHX0McrTMTyhYvKE4haaf2mW08I+jGAjEE=
3838
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
3939
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
40-
github.com/prometheus/common v0.64.0 h1:pdZeA+g617P7oGv1CzdTzyeShxAGrTBsolKNOLQPGO4=
41-
github.com/prometheus/common v0.64.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
42-
github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg=
43-
github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is=
40+
github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
41+
github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
42+
github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=
43+
github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
4444
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
4545
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
4646
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
4747
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
4848
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
49-
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
50-
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
51-
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
52-
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
49+
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
50+
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
51+
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
52+
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
53+
google.golang.org/protobuf v1.36.8 h1:xHScyCOEuuwZEc6UtSOvPbAT4zRh0xcNRYekJwfqyMc=
54+
google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
5355
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5456
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
5557
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

0 commit comments

Comments
 (0)