Skip to content

Commit

Permalink
fix dockerfiles (kyma-project#2393)
Browse files Browse the repository at this point in the history
* bump

* bump

* fix dockerfiles

* more fixes

* remove first debug

* revert bump
  • Loading branch information
mrCherry97 authored Mar 20, 2023
1 parent 361465d commit a251457
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ---- Base Alpine with Node ----
FROM alpine:3.15.0 AS builder
ARG TAG_DEFAULT_TAG
ARG TAG_default_tag

RUN apk add --update nodejs npm

Expand All @@ -17,7 +17,7 @@ ENV CI true

COPY . /app

RUN sed -i "s/version: dev/version: ${TAG_DEFAULT_TAG}/" public/version.yaml && make resolve validate
RUN sed -i "s/version: dev/version: ${TAG_default_tag}/" public/version.yaml && make resolve validate

RUN npm test 2>&1 && npm run build:docker

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.local
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# ---- Base Alpine with Node ----
FROM alpine:3.15.0 AS builder
ARG TAG_DEFAULT_TAG
ARG TAG_default_tag

RUN apk add --update nodejs npm

Expand All @@ -19,7 +19,7 @@ ENV CI true

COPY . /app

RUN sed -i "s/version: dev/version: ${TAG_DEFAULT_TAG}/" public/version.yaml && make resolve validate
RUN sed -i "s/version: dev/version: ${TAG_default_tag}/" public/version.yaml && make resolve validate

RUN npm test 2>&1 && npm run build:docker
RUN cd /app/backend && npm run build
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ release: build-image push-image
release-local: build-image-local push-image-local

build-image:
docker build --build-arg=TAG_DEFAULT_TAG=$(TAG) -t $(IMG_NAME) -f Dockerfile .
docker build --build-arg=TAG_default_tag=$(TAG) -t $(IMG_NAME) -f Dockerfile .

build-image-local:
docker build --build-arg=TAG_DEFAULT_TAG=$(TAG) -t $(LOCAL_IMG_NAME) -f Dockerfile.local .
docker build --build-arg=TAG_default_tag=$(TAG) -t $(LOCAL_IMG_NAME) -f Dockerfile.local .

push-image:
docker tag $(IMG_NAME) $(IMG):$(TAG)
Expand Down

0 comments on commit a251457

Please sign in to comment.