Skip to content

Commit

Permalink
Merge branch 'main' into 68-reader-role
Browse files Browse the repository at this point in the history
  • Loading branch information
anneliawa committed Aug 15, 2023
2 parents 8848da9 + 7f68159 commit e7fd1c4
Show file tree
Hide file tree
Showing 32 changed files with 3,085 additions and 27,387 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@

name: radix-public-site-pr
on:
pull_request:
branches:
- main
jobs:
build:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Build docker image
working-directory: public-site
env:
REF: ${{ github. sha }}
run: docker build -t radix-public-site:${REF##*/} .
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,3 @@ build
.jekyll-cache/
.jekyll-metadata
**/.DS_Store
public-site/docs/node_modules/
public-site/docs/src/.vuepress/dist/
4 changes: 2 additions & 2 deletions public-site/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM node:16-alpine as builder
FROM node:18-alpine as builder

WORKDIR /site
COPY ./docs .
RUN npm install
RUN npm run build

FROM nginxinc/nginx-unprivileged:1.23-alpine
FROM nginxinc/nginx-unprivileged:1.25-alpine
WORKDIR /site
COPY --from=builder /site/src/.vuepress/dist /site
COPY nginx.conf /etc/nginx/conf.d/default.conf
Expand Down
6 changes: 3 additions & 3 deletions public-site/README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# Radix Public Site

This is the public site for promoting, documenting & showcasing the Radix
platform. It is a static site built with [Vuepress](https://vuepress.vuejs.org/).
platform. It is a static site built with [VuePress 2](https://v2.vuepress.vuejs.org/).

## Running, building

### The easy way

docker-compose up
docker compose up --build

This builds a Docker image `radix-public-site`, runs it in the container
`radix-public-site_container`, mounts the local directory into `/site` in the
container.

You can see the site on <http://localhost:4000>
You can see the site on <http://localhost:8081>

Stop the server with Ctrl+C, but also run `docker-compose down` to clean up the
Docker state.
Expand Down
2 changes: 1 addition & 1 deletion public-site/dev.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16-alpine
FROM node:18-alpine

WORKDIR /site
COPY ./docs/package.json ./docs/package-lock.json /site/
Expand Down
4 changes: 4 additions & 0 deletions public-site/docs/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node_modules/
src/.vuepress/dist/
src/.vuepress/.cache/
src/.vuepress/.temp/
2 changes: 2 additions & 0 deletions public-site/docs/.npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ npm-debug.log
coverage/
run
dist
.cache
.temp
.DS_Store
.nyc_output
.basement
Expand Down
7 changes: 0 additions & 7 deletions public-site/docs/404.md

This file was deleted.

6 changes: 0 additions & 6 deletions public-site/docs/50x.md

This file was deleted.

64 changes: 0 additions & 64 deletions public-site/docs/index.scss

This file was deleted.

Loading

0 comments on commit e7fd1c4

Please sign in to comment.