7 files changed, 28 insertions, 14 deletions
diff --git a/cmd/go-import-redirect-aws/go.mod b/cmd/go-import-redirect-aws/go.mod
new file mode 100644
index 0000000..882bbf8
--- /dev/null
+++ b/cmd/go-import-redirect-aws/go.mod
@@ -0,0 +1,13 @@
+module go.awhk.org/go-import-redirect/cmd/go-import-redirect-aws
+
+go 1.18
+
+require (
+	github.com/aws/aws-lambda-go v1.32.0
+	go.awhk.org/go-import-redirect v0.4.0
+)
+
+require (
+	github.com/google/go-cmp v0.5.8 // indirect
+	go.awhk.org/core v0.0.0-20220618115257-41a47c757dca // indirect
+)
diff --git a/cmd/go-import-redirect-aws/go.sum b/cmd/go-import-redirect-aws/go.sum
new file mode 100644
index 0000000..be8832f
--- /dev/null
+++ b/cmd/go-import-redirect-aws/go.sum
@@ -0,0 +1,12 @@
+github.com/aws/aws-lambda-go v1.32.0 h1:i8MflawW1hoyYp85GMH7LhvAs4cqzL7LOS6fSv8l2KM=
+github.com/aws/aws-lambda-go v1.32.0/go.mod h1:IF5Q7wj4VyZyUFnZ54IQqeWtctHQ9tz+KhcbDenr220=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+go.awhk.org/core v0.0.0-20220618115257-41a47c757dca h1:BFEKF8Ee3JyltAiViWR/MNedIvdqO6N3ywTj9NoGMCo=
+go.awhk.org/core v0.0.0-20220618115257-41a47c757dca/go.mod h1:5C9oWobMcQLGj+rcfvAvSiGrp/vslOD0eUiwYymTaQI=
+go.awhk.org/go-import-redirect v0.4.0 h1:tpkut6Y8h18v2vOwiVaLZqJf+wMZ2ka++UQR7Bcv6Hw=
+go.awhk.org/go-import-redirect v0.4.0/go.mod h1:ikQIE2DO13h15oS9ZqoLzDROL9x/RI86ZuQ44sH+1JA=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
diff --git a/main_aws.go b/cmd/go-import-redirect-aws/main.go
index 76cd5b9..fb758a3 100644
--- a/main_aws.go
+++ b/cmd/go-import-redirect-aws/main.go
@@ -1,8 +1,6 @@
 // SPDX-FileCopyrightText: © 2019 Grégoire Duchêne <gduchene@awhk.org>
 // SPDX-License-Identifier: ISC
 
-//go:build aws && linux
-
 package main
 
 import (
diff --git a/main.go b/cmd/go-import-redirect/main.go
index dd7e262..dd7e262 100644
--- a/main.go
+++ b/cmd/go-import-redirect/main.go
diff --git a/docker/Dockerfile b/docker/Dockerfile
index cd1fe2a..07ae387 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,8 +1,8 @@
-FROM golang:1.17
+FROM golang:1.18
 WORKDIR /root
 COPY . ./
 ENV CGO_ENABLED=0
-RUN go build -tags nosystemd
+RUN go build ./cmd/go-import-redirect
 
 FROM scratch
 COPY --from=0 /root/go-import-redirect /go-import-redirect
diff --git a/go.mod b/go.mod
index 7dfe583..5891c70 100644
--- a/go.mod
+++ b/go.mod
@@ -2,9 +2,6 @@ module go.awhk.org/go-import-redirect
 
 go 1.18
 
-require (
-	github.com/aws/aws-lambda-go v1.32.0
-	go.awhk.org/core v0.0.0-20220618115257-41a47c757dca
-)
+require go.awhk.org/core v0.0.0-20220618115257-41a47c757dca
 
 require github.com/google/go-cmp v0.5.8 // indirect
diff --git a/go.sum b/go.sum
index b166009..21798b9 100644
--- a/go.sum
+++ b/go.sum
@@ -1,10 +1,4 @@
-github.com/aws/aws-lambda-go v1.32.0 h1:i8MflawW1hoyYp85GMH7LhvAs4cqzL7LOS6fSv8l2KM=
-github.com/aws/aws-lambda-go v1.32.0/go.mod h1:IF5Q7wj4VyZyUFnZ54IQqeWtctHQ9tz+KhcbDenr220=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 go.awhk.org/core v0.0.0-20220618115257-41a47c757dca h1:BFEKF8Ee3JyltAiViWR/MNedIvdqO6N3ywTj9NoGMCo=
 go.awhk.org/core v0.0.0-20220618115257-41a47c757dca/go.mod h1:5C9oWobMcQLGj+rcfvAvSiGrp/vslOD0eUiwYymTaQI=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=