Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow insecure connections #80

Merged
merged 3 commits into from
Dec 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ jobs:

steps:
- name: Log in to the container registry
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ secrets.DOCKER_REGISTRY_USER }}
password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}

- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Go
uses: actions/setup-go@v4
Expand All @@ -40,7 +40,7 @@ jobs:
- name: Lint
uses: golangci/golangci-lint-action@v3
with:
args: --build-tags integration -p bugs -p unused --timeout=10m
args: --build-tags integration -p bugs -p unused -D protogetter --timeout=10m

- name: Make tag
run: |
Expand All @@ -55,7 +55,7 @@ jobs:
make server

- name: Build and push image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: true
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM alpine:3.18 as health-downloader
FROM alpine:3.19 as health-downloader
ENV GRPC_HEALTH_PROBE_VERSION=v0.4.19 \
GRPC_HEALTH_PROBE_URL=https://github.com/grpc-ecosystem/grpc-health-probe/releases/download
RUN apk -U add curl \
&& curl -fLso /bin/grpc_health_probe \
${GRPC_HEALTH_PROBE_URL}/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 \
&& chmod +x /bin/grpc_health_probe

FROM alpine:3.18
FROM alpine:3.19
RUN apk -U add ca-certificates
COPY --from=health-downloader /bin/grpc_health_probe /bin/grpc_health_probe
COPY bin/server /masterdata-api
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ mocks:
--user $$(id -u):$$(id -g) \
-w /work \
-v ${PWD}:/work \
vektra/mockery:v2.24.0 -r --keeptree --dir api/v1 --output api/v1/mocks --all
vektra/mockery:v2.38.0 -r --keeptree --dir api/v1 --output api/v1/mocks --all

docker run --rm \
--user $$(id -u):$$(id -g) \
-w /work \
-v ${PWD}:/work \
vektra/mockery:v2.24.0 -r --keeptree --dir pkg/datastore --output pkg/datastore/mocks --all
vektra/mockery:v2.38.0 -r --keeptree --dir pkg/datastore --output pkg/datastore/mocks --all

.PHONY: postgres-up
postgres-up: postgres-rm
Expand Down
35 changes: 29 additions & 6 deletions api/v1/mocks/ProjectServiceClient.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 29 additions & 6 deletions api/v1/mocks/ProjectServiceServer.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 29 additions & 6 deletions api/v1/mocks/TenantServiceClient.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading