Skip to content

Commit

Permalink
[PLATFORM-402]: [Localauth0] Expose the backend and the frontend unde…
Browse files Browse the repository at this point in the history
…r a single service (#8)

* WIP trying to fix

* Fake drone.yml

* WIP for CI

* Revert README stuff that belong to another issue

* drone signature

* Add build command

* Remove CARGO_TARGET_DIR env

* v0.2.1

Co-authored-by: Eugenio Laghi <[email protected]>
  • Loading branch information
cottinisimone and EugenioLaghi authored Apr 14, 2022
1 parent b0f7367 commit 9d682ce
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 5 deletions.
13 changes: 12 additions & 1 deletion .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,16 @@ steps:
depends_on:
- build-image

- name: build-web
image: prima/localauth0-ci:${DRONE_COMMIT}
commands:
- trunk build web/index.html
volumes:
- name: docker
path: /var/run/docker.sock
depends_on:
- build-image

- name: build-localauth0
image: public.ecr.aws/prima/drone-tools:1.21.4
commands:
Expand All @@ -55,6 +65,7 @@ steps:
depends_on:
- build-image
- build-artifact
- build-web

volumes:
- name: docker
Expand Down Expand Up @@ -111,6 +122,6 @@ depends_on:

---
kind: signature
hmac: 8e04ba253ae3fbcb7f1184f59315f106a8c6dc946a83af148cb70e0e626c521d
hmac: 0677ad8b64c9d504c15ed6ef978a74a63f15ae4f8fb7aa5be91392333ca7076e

...
2 changes: 1 addition & 1 deletion Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "localauth0"
version = "0.2.0"
version = "0.2.1"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
1 change: 1 addition & 0 deletions Dockerfile_localauth0
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ RUN apt-get update && \
apt-get autoremove

COPY target/debug/localauth0 /localauth0
COPY web/dist /web/dist

ENTRYPOINT ["/localauth0"]
5 changes: 5 additions & 0 deletions Makefile.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
[tasks.build]
command = "cargo"
args = [ "build"]
dependencies = ["trunk-build"]

[tasks.run]
command = "cargo"
args = [ "run"]
Expand Down
3 changes: 1 addition & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ services:
volumes:
- .:$PWD:cached
ports:
- 3000:3000
- "3000:3000"
working_dir: $PWD
environment:
CARGO_HOME: /home/app/.cargo
CARGO_TARGET_DIR: /home/app/target-docker
networks:
- default

0 comments on commit 9d682ce

Please sign in to comment.