mirror of
https://github.com/RoboSats/robosats.git
synced 2024-08-17 01:40:39 +03:00
Merge branch 'main' into the-federation-layer-v0.6.0
This commit is contained in:
commit
8af3edad6f
12
.github/workflows/web-client-image.yml
vendored
12
.github/workflows/web-client-image.yml
vendored
@ -22,7 +22,7 @@ jobs:
|
|||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: 'Copy Static' # Needed since Github actions does not support symlinks
|
- name: 'Copy Static' # Needed since Github actions does not support symlinks
|
||||||
run: cp -r frontend/static nodeapp/static
|
run: cp -r frontend/static web/static
|
||||||
|
|
||||||
- name: 'Download main.js Artifact'
|
- name: 'Download main.js Artifact'
|
||||||
if: inputs.semver == '' # Only if workflow fired from frontend-build.yml
|
if: inputs.semver == '' # Only if workflow fired from frontend-build.yml
|
||||||
@ -31,14 +31,14 @@ jobs:
|
|||||||
workflow: frontend-build.yml
|
workflow: frontend-build.yml
|
||||||
workflow_conclusion: success
|
workflow_conclusion: success
|
||||||
name: web-main-js
|
name: web-main-js
|
||||||
path: nodeapp/static/frontend/
|
path: web/static/frontend/
|
||||||
|
|
||||||
- name: 'Download main.js Artifact for a release'
|
- name: 'Download main.js Artifact for a release'
|
||||||
if: inputs.semver != '' # Only if fired as job in release.yml
|
if: inputs.semver != '' # Only if fired as job in release.yml
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: web-main-js
|
name: web-main-js
|
||||||
path: nodeapp/static/frontend/
|
path: web/static/frontend/
|
||||||
|
|
||||||
- name: 'Download pro.js Artifact'
|
- name: 'Download pro.js Artifact'
|
||||||
if: inputs.semver == '' # Only if workflow fired from frontend-build.yml
|
if: inputs.semver == '' # Only if workflow fired from frontend-build.yml
|
||||||
@ -47,14 +47,14 @@ jobs:
|
|||||||
workflow: frontend-build.yml
|
workflow: frontend-build.yml
|
||||||
workflow_conclusion: success
|
workflow_conclusion: success
|
||||||
name: web-pro-js
|
name: web-pro-js
|
||||||
path: nodeapp/static/frontend/
|
path: web/static/frontend/
|
||||||
|
|
||||||
- name: 'Download pro.js Artifact for a release'
|
- name: 'Download pro.js Artifact for a release'
|
||||||
if: inputs.semver != '' # Only if fired as job in release.yml
|
if: inputs.semver != '' # Only if fired as job in release.yml
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: web-pro-js
|
name: web-pro-js
|
||||||
path: nodeapp/static/frontend/
|
path: web/static/frontend/
|
||||||
|
|
||||||
- name: 'Log in to Docker Hub'
|
- name: 'Log in to Docker Hub'
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
@ -87,7 +87,7 @@ jobs:
|
|||||||
- name: 'Build and push Docker image'
|
- name: 'Build and push Docker image'
|
||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v5
|
||||||
with:
|
with:
|
||||||
context: ./nodeapp
|
context: ./web
|
||||||
platforms: linux/amd64,linux/arm64
|
platforms: linux/amd64,linux/arm64
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
|
@ -14,13 +14,11 @@ RUN set -x \
|
|||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
COPY ./nginx.conf /etc/nginx/nginx.conf
|
COPY ./nginx.conf /etc/nginx/nginx.conf
|
||||||
COPY ./coordinators/ /etc/nginx/conf.d/
|
|
||||||
|
|
||||||
RUN apk -U --no-cache upgrade \
|
RUN apk -U --no-cache upgrade \
|
||||||
&& apk --no-cache add socat \
|
|
||||||
&& apk --no-cache add nginx
|
&& apk --no-cache add nginx
|
||||||
|
|
||||||
EXPOSE 12596
|
EXPOSE 80
|
||||||
HEALTHCHECK CMD curl --fail http://localhost:12596/selfhosted || exit 1
|
HEALTHCHECK CMD curl --fail http://localhost:80 || exit 1
|
||||||
|
|
||||||
CMD ["sh", "robosats-client.sh"]
|
CMD ["sh", "run.sh"]
|
||||||
|
@ -28,11 +28,8 @@ http {
|
|||||||
|
|
||||||
server {
|
server {
|
||||||
|
|
||||||
listen 12596;
|
listen 80;
|
||||||
server_name robosats_client;
|
server_name robosats_web_client;
|
||||||
|
|
||||||
# add_header Access-Control-Allow-Headers "*";
|
|
||||||
# add_header Access-Control-Allow-Origin "*";
|
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
root /usr/src/robosats;
|
root /usr/src/robosats;
|
||||||
|
2
web/run.sh
Normal file
2
web/run.sh
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
nginx
|
Loading…
Reference in New Issue
Block a user