Skip to content

Commit

Permalink
fix: do not build acompat docker image
Browse files Browse the repository at this point in the history
We don't need it.

Signed-off-by: Artem Chernyshev <artem.chernyshev@talos-systems.com>
  • Loading branch information
Unix4ever committed Oct 21, 2024
1 parent cd1f2bd commit 98315a9
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 49 deletions.
30 changes: 4 additions & 26 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-10-21T13:17:39Z by kres 34e72ac.
# Generated on 2024-10-21T13:53:43Z by kres 34e72ac.

name: default
concurrency:
Expand Down Expand Up @@ -108,34 +108,12 @@ jobs:
- name: acompat
run: |
make acompat
- name: lint
run: |
make lint
- name: Login to registry
if: github.event_name != 'pull_request'
uses: docker/login-action@v3
with:
password: ${{ secrets.GITHUB_TOKEN }}
registry: ghcr.io
username: ${{ github.repository_owner }}
- name: image-acompat
run: |
make image-acompat
- name: push-acompat
if: github.event_name != 'pull_request'
env:
PUSH: "true"
run: |
make image-acompat
- name: push-acompat-latest
if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
env:
PUSH: "true"
run: |
make image-acompat IMAGE_TAG=latest
- name: integration-test
run: |
make integration-test
- name: lint
run: |
make lint
- name: Login to registry
if: github.event_name != 'pull_request'
uses: docker/login-action@v3
Expand Down
5 changes: 5 additions & 0 deletions .kres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ name: omnictl
spec:
disableImage: true
---
kind: auto.CommandConfig
name: acompat
spec:
disableImage: true
---
kind: common.GHWorkflow
spec:
customRunners:
Expand Down
11 changes: 1 addition & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-10-21T13:17:39Z by kres 34e72ac.
# Generated on 2024-10-21T13:53:43Z by kres 34e72ac.

ARG JS_TOOLCHAIN
ARG TOOLCHAIN
Expand Down Expand Up @@ -530,15 +530,6 @@ COPY --from=omnictl-linux-amd64 / /
COPY --from=omnictl-linux-arm64 / /
COPY --from=omnictl-windows-amd64.exe / /

FROM scratch AS image-acompat
ARG TARGETARCH
COPY --from=acompat acompat-linux-${TARGETARCH} /acompat
COPY --from=acompat acompat-linux-${TARGETARCH} /acompat
COPY --from=image-fhs / /
COPY --from=image-ca-certificates / /
LABEL org.opencontainers.image.source=https://github.com/siderolabs/omni
ENTRYPOINT ["/acompat"]

FROM scratch AS image-integration-test
ARG TARGETARCH
COPY --from=integration-test integration-test-linux-${TARGETARCH} /integration-test
Expand Down
22 changes: 9 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
#
# Generated on 2024-10-21T13:17:39Z by kres 34e72ac.
# Generated on 2024-10-21T13:53:43Z by kres 34e72ac.

# common variables

Expand Down Expand Up @@ -141,7 +141,7 @@ else
GO_LDFLAGS += -s
endif

all: unit-tests-frontend lint-eslint frontend unit-tests-client unit-tests acompat image-acompat integration-test image-integration-test omni image-omni omnictl dev-server docker-compose-up docker-compose-down mkcert-install mkcert-generate mkcert-uninstall run-integration-test lint
all: unit-tests-frontend lint-eslint frontend unit-tests-client unit-tests acompat integration-test image-integration-test omni image-omni omnictl dev-server docker-compose-up docker-compose-down mkcert-install mkcert-generate mkcert-uninstall run-integration-test lint

$(ARTIFACTS): ## Creates artifacts directory.
@mkdir -p $(ARTIFACTS)
Expand Down Expand Up @@ -236,17 +236,6 @@ acompat-linux-amd64: $(ARTIFACTS)/acompat-linux-amd64 ## Builds executable for
.PHONY: acompat
acompat: acompat-linux-amd64 ## Builds executables for acompat.

.PHONY: lint-markdown
lint-markdown: ## Runs markdownlint.
@$(MAKE) target-$@

.PHONY: lint
lint: lint-eslint lint-golangci-lint-client lint-gofumpt-client lint-govulncheck-client lint-golangci-lint lint-gofumpt lint-govulncheck lint-markdown ## Run all linters for the project.

.PHONY: image-acompat
image-acompat: ## Builds image for acompat.
@$(MAKE) target-$@ TARGET_ARGS="--tag=$(REGISTRY)/$(USERNAME)/acompat:$(IMAGE_TAG)"

.PHONY: $(ARTIFACTS)/integration-test-linux-amd64
$(ARTIFACTS)/integration-test-linux-amd64:
@$(MAKE) local-integration-test-linux-amd64 DEST=$(ARTIFACTS)
Expand All @@ -264,6 +253,13 @@ integration-test-linux-arm64: $(ARTIFACTS)/integration-test-linux-arm64 ## Buil
.PHONY: integration-test
integration-test: integration-test-linux-amd64 integration-test-linux-arm64 ## Builds executables for integration-test.

.PHONY: lint-markdown
lint-markdown: ## Runs markdownlint.
@$(MAKE) target-$@

.PHONY: lint
lint: lint-eslint lint-golangci-lint-client lint-gofumpt-client lint-govulncheck-client lint-golangci-lint lint-gofumpt lint-govulncheck lint-markdown ## Run all linters for the project.

.PHONY: image-integration-test
image-integration-test: ## Builds image for omni-integration-test.
@$(MAKE) target-$@ TARGET_ARGS="--tag=$(REGISTRY)/$(USERNAME)/omni-integration-test:$(IMAGE_TAG)"
Expand Down

0 comments on commit 98315a9

Please sign in to comment.