You've already forked img-proxy-url-generator
Updated go version 1.24.0
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
FROM siteworxpro/golang:1.23.4 AS build
|
FROM siteworxpro/golang:1.24.0 AS build
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
@@ -18,4 +18,11 @@ WORKDIR /app
|
|||||||
|
|
||||||
COPY --from=build /app/imgproxy /app/imgproxy
|
COPY --from=build /app/imgproxy /app/imgproxy
|
||||||
|
|
||||||
|
RUN adduser -u 1001 -g appuser appuser -D && \
|
||||||
|
chown -R appuser:appuser /app
|
||||||
|
|
||||||
|
USER 1001
|
||||||
|
|
||||||
|
# docker buildx build --push --sbom=true --provenance=true --platform linux/amd64,linux/arm64 -t siteworxpro/img-proxy-url-generator:v1.4.0-grpc .
|
||||||
|
|
||||||
ENTRYPOINT ["/app/imgproxy", "grpc"]
|
ENTRYPOINT ["/app/imgproxy", "grpc"]
|
||||||
@@ -7,7 +7,7 @@ import (
|
|||||||
|
|
||||||
type Config struct {
|
type Config struct {
|
||||||
initializeOnce sync.Once
|
initializeOnce sync.Once
|
||||||
Generator *generatorConfig
|
Generator *GeneratorConfig
|
||||||
Aws *awsConfig
|
Aws *awsConfig
|
||||||
Redis *redisConfig
|
Redis *redisConfig
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import (
|
|||||||
"github.com/bigkevmcd/go-configparser"
|
"github.com/bigkevmcd/go-configparser"
|
||||||
)
|
)
|
||||||
|
|
||||||
type generatorConfig struct {
|
type GeneratorConfig struct {
|
||||||
Salt []byte
|
Salt []byte
|
||||||
Key []byte
|
Key []byte
|
||||||
Host string
|
Host string
|
||||||
@@ -13,11 +13,11 @@ type generatorConfig struct {
|
|||||||
PlainUrl bool
|
PlainUrl bool
|
||||||
}
|
}
|
||||||
|
|
||||||
func getGeneratorConfig(p *configparser.ConfigParser) (*generatorConfig, error) {
|
func getGeneratorConfig(p *configparser.ConfigParser) (*GeneratorConfig, error) {
|
||||||
var config string
|
var config string
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
gc := &generatorConfig{}
|
gc := &GeneratorConfig{}
|
||||||
if !p.HasSection("img-proxy") {
|
if !p.HasSection("img-proxy") {
|
||||||
return nil, fmt.Errorf("config error - [img-proxy] config required")
|
return nil, fmt.Errorf("config error - [img-proxy] config required")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,17 @@
|
|||||||
package generator
|
package generator
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/config"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestGenerator_GenerateBase64(t *testing.T) {
|
func TestGenerator_GenerateBase64(t *testing.T) {
|
||||||
g, err := NewGenerator(Config{})
|
g, err := NewGenerator(&config.Config{
|
||||||
|
Generator: &config.GeneratorConfig{
|
||||||
|
Key: []byte("f2d1f37016b7d12ab27b25377f39fd84e2d3368472ff096261ce7ac3e8490af429d43803836ad6a42a3bd9fb859a38137173619cb00bcb6fe3870e3feab2b764"),
|
||||||
|
Salt: []byte("919ed8813f76abfd42968b10e05258db"),
|
||||||
|
},
|
||||||
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,18 @@
|
|||||||
package generator
|
package generator
|
||||||
|
|
||||||
import "testing"
|
import (
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/config"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
func TestGenerator_StringToFormat(t *testing.T) {
|
func TestGenerator_StringToFormat(t *testing.T) {
|
||||||
g, err := NewGenerator(Config{})
|
g, err := NewGenerator(&config.Config{
|
||||||
|
Generator: &config.GeneratorConfig{
|
||||||
|
Key: []byte("2c90317177aa7a3c44fa6804bf9bf466930f36ac9262bfdae972e836a9f83d239fd6bcee0c91a29ada58cc7329c787f35d2309f0984f2fd315e2c27bac8ac247"),
|
||||||
|
Salt: []byte("2777def3372a385f4aa7e62b2b431927"),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
@@ -23,7 +32,13 @@ func TestGenerator_StringToFormat(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestGenerator_StringToFormatError(t *testing.T) {
|
func TestGenerator_StringToFormatError(t *testing.T) {
|
||||||
g, err := NewGenerator(Config{})
|
g, err := NewGenerator(&config.Config{
|
||||||
|
Generator: &config.GeneratorConfig{
|
||||||
|
Key: []byte("f2d1f37016b7d12ab27b25377f39fd84e2d3368472ff096261ce7ac3e8490af429d43803836ad6a42a3bd9fb859a38137173619cb00bcb6fe3870e3feab2b764"),
|
||||||
|
Salt: []byte("919ed8813f76abfd42968b10e05258db"),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,19 @@
|
|||||||
package generator
|
package generator
|
||||||
|
|
||||||
import "testing"
|
import (
|
||||||
|
"github.com/siteworxpro/img-proxy-url-generator/config"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
func TestGenerator_GenerateUrl(t *testing.T) {
|
func TestGenerator_GenerateUrl(t *testing.T) {
|
||||||
g, err := NewGenerator(Config{})
|
g, err := NewGenerator(&config.Config{
|
||||||
|
Generator: &config.GeneratorConfig{
|
||||||
|
Key: []byte("f2d1f37016b7d12ab27b25377f39fd84e2d3368472ff096261ce7ac3e8490af429d43803836ad6a42a3bd9fb859a38137173619cb00bcb6fe3870e3feab2b764"),
|
||||||
|
Salt: []byte("919ed8813f76abfd42968b10e05258db"),
|
||||||
|
PlainUrl: true,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user