Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Commit

Permalink
wip: use distinct names for dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
Noah Negin-Ulster committed Mar 24, 2022
1 parent c905c58 commit 8597004
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,8 @@ max_line_length = off
[*.yml]
indent_size = 2

[Makefile]
indent_style = tab

[{CHANGELOG.md,package.json,yarn.lock}]
indent_size = false
4 changes: 2 additions & 2 deletions client/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ ifndef CI
@make package
endif
@echo "Building Docker Container"
docker build . -t ghcr.io/tophat/sanity-runner-client
docker build . -f client.Dockerfile -t ghcr.io/tophat/sanity-runner-client

.PHONY: package
package:
yarn pkg . --out-path bin/ --targets "node16"
yarn workspace sanity-runner-client pkg . --out-path bin/ --targets "node16-linux"

# ----- Helpers -----

Expand Down
4 changes: 2 additions & 2 deletions client/Dockerfile → client/client.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN apt-get update && \
pip install awscli

COPY config.json /config.json
COPY bin/sanity-runner-client-linux /usr/local/bin/sanity-runner
RUN chmod 777 /usr/local/bin/sanity-runner
COPY bin/sanity-runner-client /usr/local/bin/sanity-runner
RUN chmod 777 /usr/local/bin/sanity-runner

CMD sanity-runner --config config.json
4 changes: 2 additions & 2 deletions service/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies:

.PHONY: install
install: clean
make terraform-dependencies
make terraform-dependencies
make dependencies

# ----- Helpers -----
Expand Down Expand Up @@ -68,7 +68,7 @@ package: bundle build-docker
.PHONY: build-docker
build-docker:
@echo "Building Docker Container"
docker build ../ -f Dockerfile -t ghcr.io/tophat/sanity-runner-service
docker build ../ -f service.Dockerfile -t ghcr.io/tophat/sanity-runner-service

.PHONY: publish-docker
publish-docker:
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 8597004

Please sign in to comment.