Skip to content

Commit c58bfab

Browse files
ViBiOhViBiOh
committed
chore(deps): Adding git repository tagging
Signed-off-by: Vincent Boutour <bob@vibioh.fr>
1 parent b4e7d3e commit c58bfab

5 files changed

Lines changed: 23 additions & 18 deletions

File tree

‎.github/workflows/build.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
run: |
8585
curl --disable --silent --show-error --location --max-time 30 "https://raw.githubusercontent.com/ViBiOh/scripts/main/bootstrap" | bash -s -- "-c" "release"
8686
./download_exiftool
87-
DOCKER_IMAGE="${{ secrets.DOCKER_USER }}/$(make name)" IMAGE_VERSION="$(make version)" ./scripts/release build
87+
./scripts/release build
8888
- name: Setup Docker
8989
uses: docker/setup-buildx-action@v3
9090
- name: Setup DockerHub
@@ -102,7 +102,7 @@ jobs:
102102
DOCKER_USER: ${{ secrets.DOCKER_USER }}
103103
DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
104104
run: |
105-
RELEASE_NEED_WAIT=true DOCKER_IMAGE="${{ secrets.DOCKER_USER }}/$(make name)" IMAGE_VERSION="$(make version)" ./scripts/release docker
105+
RELEASE_NEED_WAIT=true DOCKER_IMAGE="${{ secrets.DOCKER_USER }}/$(make name)" IMAGE_VERSION="$(make version)" GIT_SHA="$(make version-full)" ./scripts/release docker
106106
107107
publish:
108108
name: Publish

‎Makefile‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,16 @@ help: Makefile
2626
name:
2727
@printf "$(APP_NAME)"
2828

29-
## version: Output last commit sha
29+
## version: Output last commit sha in short version
3030
.PHONY: version
3131
version:
3232
@printf "$(shell git rev-parse --short HEAD)"
3333

34+
## version-full: Output last commit sha
35+
.PHONY: version-full
36+
version-full:
37+
@printf "$(shell git rev-parse HEAD)"
38+
3439
## version-date: Output last commit date
3540
.PHONY: version-date
3641
version-date:

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ toolchain go1.21.0
77
require (
88
github.com/ViBiOh/absto v1.7.4
99
github.com/ViBiOh/flags v1.4.1
10-
github.com/ViBiOh/httputils/v4 v4.69.9
10+
github.com/ViBiOh/httputils/v4 v4.69.10
1111
github.com/rabbitmq/amqp091-go v1.9.0
1212
go.opentelemetry.io/otel v1.21.0
1313
go.opentelemetry.io/otel/metric v1.21.0
@@ -47,9 +47,9 @@ require (
4747
golang.org/x/sys v0.15.0 // indirect
4848
golang.org/x/term v0.15.0 // indirect
4949
golang.org/x/text v0.14.0 // indirect
50-
google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4 // indirect
51-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect
52-
google.golang.org/grpc v1.59.0 // indirect
50+
google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect
51+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
52+
google.golang.org/grpc v1.60.0 // indirect
5353
google.golang.org/protobuf v1.31.0 // indirect
5454
gopkg.in/ini.v1 v1.67.0 // indirect
5555
)

‎go.sum‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ github.com/ViBiOh/absto v1.7.4 h1:OSHot3kdWXtM9Brjwth3ZgmlXHq2ZUU3L+PmZVrbaLs=
22
github.com/ViBiOh/absto v1.7.4/go.mod h1:wWKqd0pH9fqxWDZdKhLBnpKFORMdMQJ3tZuu+v3hTrk=
33
github.com/ViBiOh/flags v1.4.1 h1:qEAO70rWTYcVlU9BgCuz0SgMjth12oi502cq3SHDudg=
44
github.com/ViBiOh/flags v1.4.1/go.mod h1:Ocgx/QhY7WYNfGokFT3kw5C05pDooQyLbI/9ZWwylI4=
5-
github.com/ViBiOh/httputils/v4 v4.69.9 h1:1meeYmIqVn00orVvU8fP2FGO2/p4Oq/1qFx9WHYzW8I=
6-
github.com/ViBiOh/httputils/v4 v4.69.9/go.mod h1:kbEMQIBLao9aly8BWtLzuVY6cZ7CL8SaNy53JjH1yus=
5+
github.com/ViBiOh/httputils/v4 v4.69.10 h1:Me+aF/i9AC+G2ADwa4k9RCcmAlw5bEE4AcmR6eSPc24=
6+
github.com/ViBiOh/httputils/v4 v4.69.10/go.mod h1:QBkpuYRlvcQNbVdJOepFN3vnrsrkyqg4NlU05tQISo4=
77
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
88
github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
99
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
@@ -122,14 +122,14 @@ golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
122122
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
123123
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
124124
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
125-
google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f h1:Vn+VyHU5guc9KjB5KrjI2q0wCOWEOIh0OEsleqakHJg=
126-
google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f/go.mod h1:nWSwAFPb+qfNJXsoeO3Io7zf4tMSfN8EA8RlDA04GhY=
127-
google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4 h1:ZcOkrmX74HbKFYnpPY8Qsw93fC29TbJXspYKaBkSXDQ=
128-
google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4/go.mod h1:k2dtGpRrbsSyKcNPKKI5sstZkrNCZwpU/ns96JoHbGg=
129-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 h1:DC7wcm+i+P1rN3Ff07vL+OndGg5OhNddHyTA+ocPqYE=
130-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4/go.mod h1:eJVxU6o+4G1PSczBr85xmyvSNYAKvAYgkub40YGomFM=
131-
google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
132-
google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
125+
google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3 h1:1hfbdAfFbkmpg41000wDVqr7jUpK/Yo+LPnIxxGzmkg=
126+
google.golang.org/genproto v0.0.0-20231211222908-989df2bf70f3/go.mod h1:5RBcpGRxr25RbDzY5w+dmaqpSEvl8Gwl1x2CICf60ic=
127+
google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 h1:s1w3X6gQxwrLEpxnLd/qXTVLgQE2yXwaOaoa6IlY/+o=
128+
google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0/go.mod h1:CAny0tYF+0/9rmDB9fahA9YLzX3+AEVl1qXbv5hhj6c=
129+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 h1:/jFB8jK5R3Sq3i/lmeZO0cATSzFfZaJq1J2Euan3XKU=
130+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0/go.mod h1:FUoWkonphQm3RhTS+kOEhF8h0iDpm4tdXolVCeZ9KKA=
131+
google.golang.org/grpc v1.60.0 h1:6FQAR0kM31P6MRdeluor2w2gPaS4SVNrD/DNTxrQ15k=
132+
google.golang.org/grpc v1.60.0/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM=
133133
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
134134
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
135135
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=

‎infra/api.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
EXAS_STORAGE_FILE_SYSTEM_DIRECTORY: "/data"
4242
EXAS_TELEMETRY_URL: datadog.observability:4317
4343
GOMAXPROCS: "1"
44-
OTEL_RESOURCE_ATTRIBUTES: env=production
44+
OTEL_RESOURCE_ATTRIBUTES: env=production,git.repository_url=github.com/ViBiOh/exas
4545
OTEL_SERVICE_NAME: exas
4646
secrets:
4747
EXAS_AMQP_URI: AgBXHmJI9iRMFechp/ZUYiRT4R5Us6OQ5kfqDPHxx+rmVxVAPk0x8DJaz4taHVBaCmPNUHHtYfkeOfWtf1MtroaUIWjMKQAaHnUbdmH/nSe6F4xWEEQmhEnxckdBLb6ea3euir1LRcwV4yMe6yucPbQEHH+tEi/GGx9eSsOV3+rxeg2REycqn2E5i70ry5SYVhXWbJWkvXCur7ktHoqaGKvteDnNvjyYgeD87/nOQtP5DFfSZB/Jbr0zpb5aphZBduHT9/TCQXnytckMUAMGeroTX4vgjcv1HnFWyIItsk1cXQG6zbEXoQ6kT4xDKdL2+R8sh9LnuaGHST5EV2U7TMyLLj7FLXbm+c2mcE9IdEhseuGH5DzGmxqHSr+85tvMQexy6zF6eaof+heJf4+1Xi7WcZylQaxskLqL56a3cnL1MmT3+VoiGUYJw3nV5eqiT3ZPeHoyyQBQncAAcF1ZrNAWM7GxF4Et5z31D/V4KVcFu9RNZngMLWLnXF5keGhnc70vkoJ/BMJH+REtTbuXZxMb28OEo7T99raSsM5g2qe10Mra6KieSbD0E1Zd7nlWGvyBboMBetiC4nyVLWctyDBwqId8laBKfUsby7M9SL3MebOp3Z/igfc4lg2fiOjtzgYhaSczKK7t+a84MNXF0lkXjkGYRC4Awa2QkocgJwsexl4LKUvzcQN3L4c428jL9XuE7YjRzlSplIzS8am93Zo7x8YgF4GOir7TFkWjHa7q5Wp5LwqwvYOEPVEYy7Ytpwt+

0 commit comments

Comments
 (0)