rename and add context to workflow

devsoc-unsw · Aug 4, 2024 · a566366 · a566366
1 parent 1d53b6e
commit a566366
Show file tree

Hide file tree

Showing 54 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -78,7 +78,7 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@v4
         with:
-          context: frontend
+          context: .
           push: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/main' || github.ref == 'refs/heads/docusaurusIntegration' }}
           platforms: linux/amd64
           file: frontend/Dockerfile

diff --git a/chaos-docs/.gitignore → docs/.gitignore b/chaos-docs/.gitignore → docs/.gitignore
diff --git a/chaos-docs/README.md → docs/README.md b/chaos-docs/README.md → docs/README.md
diff --git a/chaos-docs/babel.config.js → docs/babel.config.js b/chaos-docs/babel.config.js → docs/babel.config.js
diff --git a/...s-docs/blog/2019-05-28-first-blog-post.md → docs/blog/2019-05-28-first-blog-post.md b/...s-docs/blog/2019-05-28-first-blog-post.md → docs/blog/2019-05-28-first-blog-post.md
diff --git a/chaos-docs/blog/2019-05-29-long-blog-post.md → docs/blog/2019-05-29-long-blog-post.md b/chaos-docs/blog/2019-05-29-long-blog-post.md → docs/blog/2019-05-29-long-blog-post.md
diff --git a/chaos-docs/blog/2021-08-01-mdx-blog-post.mdx → docs/blog/2021-08-01-mdx-blog-post.mdx b/chaos-docs/blog/2021-08-01-mdx-blog-post.mdx → docs/blog/2021-08-01-mdx-blog-post.mdx
diff --git a/...26-welcome/docusaurus-plushie-banner.jpeg → ...26-welcome/docusaurus-plushie-banner.jpeg b/...26-welcome/docusaurus-plushie-banner.jpeg → ...26-welcome/docusaurus-plushie-banner.jpeg
diff --git a/chaos-docs/blog/2021-08-26-welcome/index.md → docs/blog/2021-08-26-welcome/index.md b/chaos-docs/blog/2021-08-26-welcome/index.md → docs/blog/2021-08-26-welcome/index.md
diff --git a/chaos-docs/blog/authors.yml → docs/blog/authors.yml b/chaos-docs/blog/authors.yml → docs/blog/authors.yml
diff --git a/chaos-docs/blog/tags.yml → docs/blog/tags.yml b/chaos-docs/blog/tags.yml → docs/blog/tags.yml
diff --git a/chaos-docs/docs/api.yml → docs/docs/api.yml b/chaos-docs/docs/api.yml → docs/docs/api.yml
diff --git a/chaos-docs/docs/chaos-api.info.mdx → docs/docs/chaos-api.info.mdx b/chaos-docs/docs/chaos-api.info.mdx → docs/docs/chaos-api.info.mdx
diff --git a/chaos-docs/docs/create-campaign.api.mdx → docs/docs/create-campaign.api.mdx b/chaos-docs/docs/create-campaign.api.mdx → docs/docs/create-campaign.api.mdx
diff --git a/chaos-docs/docs/create-organisation.api.mdx → docs/docs/create-organisation.api.mdx b/chaos-docs/docs/create-organisation.api.mdx → docs/docs/create-organisation.api.mdx
diff --git a/chaos-docs/docs/create-role.api.mdx → docs/docs/create-role.api.mdx b/chaos-docs/docs/create-role.api.mdx → docs/docs/create-role.api.mdx
diff --git a/...s-docs/docs/delete-campaign-by-id.api.mdx → docs/docs/delete-campaign-by-id.api.mdx b/...s-docs/docs/delete-campaign-by-id.api.mdx → docs/docs/delete-campaign-by-id.api.mdx
diff --git a/...cs/docs/delete-organisation-by-id.api.mdx → docs/docs/delete-organisation-by-id.api.mdx b/...cs/docs/delete-organisation-by-id.api.mdx → docs/docs/delete-organisation-by-id.api.mdx
diff --git a/chaos-docs/docs/delete-role-by-id.api.mdx → docs/docs/delete-role-by-id.api.mdx b/chaos-docs/docs/delete-role-by-id.api.mdx → docs/docs/delete-role-by-id.api.mdx
diff --git a/chaos-docs/docs/delete-user-by-id.api.mdx → docs/docs/delete-user-by-id.api.mdx b/chaos-docs/docs/delete-user-by-id.api.mdx → docs/docs/delete-user-by-id.api.mdx
diff --git a/chaos-docs/docs/get-all-campaigns.api.mdx → docs/docs/get-all-campaigns.api.mdx b/chaos-docs/docs/get-all-campaigns.api.mdx → docs/docs/get-all-campaigns.api.mdx
diff --git a/chaos-docs/docs/get-campaign-by-id.api.mdx → docs/docs/get-campaign-by-id.api.mdx b/chaos-docs/docs/get-campaign-by-id.api.mdx → docs/docs/get-campaign-by-id.api.mdx
diff --git a/chaos-docs/docs/get-logged-in-user.api.mdx → docs/docs/get-logged-in-user.api.mdx b/chaos-docs/docs/get-logged-in-user.api.mdx → docs/docs/get-logged-in-user.api.mdx
diff --git a/...-docs/docs/get-organisation-by-id.api.mdx → docs/docs/get-organisation-by-id.api.mdx b/...-docs/docs/get-organisation-by-id.api.mdx → docs/docs/get-organisation-by-id.api.mdx
diff --git a/.../get-organisation-campaigns-by-id.api.mdx → .../get-organisation-campaigns-by-id.api.mdx b/.../get-organisation-campaigns-by-id.api.mdx → .../get-organisation-campaigns-by-id.api.mdx
diff --git a/...cs/get-organisation-members-by-id.api.mdx → ...cs/get-organisation-members-by-id.api.mdx b/...cs/get-organisation-members-by-id.api.mdx → ...cs/get-organisation-members-by-id.api.mdx
diff --git a/chaos-docs/docs/get-role-by-id.api.mdx → docs/docs/get-role-by-id.api.mdx b/chaos-docs/docs/get-role-by-id.api.mdx → docs/docs/get-role-by-id.api.mdx
diff --git a/...ocs/docs/get-roles-by-campaign-id.api.mdx → docs/docs/get-roles-by-campaign-id.api.mdx b/...ocs/docs/get-roles-by-campaign-id.api.mdx → docs/docs/get-roles-by-campaign-id.api.mdx
diff --git a/chaos-docs/docs/get-user-by-id.api.mdx → docs/docs/get-user-by-id.api.mdx b/chaos-docs/docs/get-user-by-id.api.mdx → docs/docs/get-user-by-id.api.mdx
diff --git a/chaos-docs/docs/logout.api.mdx → docs/docs/logout.api.mdx b/chaos-docs/docs/logout.api.mdx → docs/docs/logout.api.mdx
diff --git a/chaos-docs/docs/sidebar.ts → docs/docs/sidebar.ts b/chaos-docs/docs/sidebar.ts → docs/docs/sidebar.ts
diff --git a/...docs/update-campaign-banner-by-id.api.mdx → ...docs/update-campaign-banner-by-id.api.mdx b/...docs/update-campaign-banner-by-id.api.mdx → ...docs/update-campaign-banner-by-id.api.mdx
diff --git a/...s-docs/docs/update-campaign-by-id.api.mdx → docs/docs/update-campaign-by-id.api.mdx b/...s-docs/docs/update-campaign-by-id.api.mdx → docs/docs/update-campaign-by-id.api.mdx
diff --git a/...cs/update-organisation-logo-by-id.api.mdx → ...cs/update-organisation-logo-by-id.api.mdx b/...cs/update-organisation-logo-by-id.api.mdx → ...cs/update-organisation-logo-by-id.api.mdx
diff --git a/...update-organisation-members-by-id.api.mdx → ...update-organisation-members-by-id.api.mdx b/...update-organisation-members-by-id.api.mdx → ...update-organisation-members-by-id.api.mdx
diff --git a/chaos-docs/docs/update-role-by-id.api.mdx → docs/docs/update-role-by-id.api.mdx b/chaos-docs/docs/update-role-by-id.api.mdx → docs/docs/update-role-by-id.api.mdx
diff --git a/chaos-docs/docs/update-user-degree.api.mdx → docs/docs/update-user-degree.api.mdx b/chaos-docs/docs/update-user-degree.api.mdx → docs/docs/update-user-degree.api.mdx
diff --git a/chaos-docs/docs/update-user-name.api.mdx → docs/docs/update-user-name.api.mdx b/chaos-docs/docs/update-user-name.api.mdx → docs/docs/update-user-name.api.mdx
diff --git a/chaos-docs/docs/update-user-zid.api.mdx → docs/docs/update-user-zid.api.mdx b/chaos-docs/docs/update-user-zid.api.mdx → docs/docs/update-user-zid.api.mdx
diff --git a/chaos-docs/docusaurus.config.ts → docs/docusaurus.config.ts b/chaos-docs/docusaurus.config.ts → docs/docusaurus.config.ts
diff --git a/chaos-docs/package-lock.json → docs/package-lock.json b/chaos-docs/package-lock.json → docs/package-lock.json
diff --git a/chaos-docs/package.json → docs/package.json b/chaos-docs/package.json → docs/package.json
diff --git a/chaos-docs/sidebars.ts → docs/sidebars.ts b/chaos-docs/sidebars.ts → docs/sidebars.ts
diff --git a/...src/components/HomepageFeatures/index.tsx → ...src/components/HomepageFeatures/index.tsx b/...src/components/HomepageFeatures/index.tsx → ...src/components/HomepageFeatures/index.tsx
diff --git a/...onents/HomepageFeatures/styles.module.css → ...onents/HomepageFeatures/styles.module.css b/...onents/HomepageFeatures/styles.module.css → ...onents/HomepageFeatures/styles.module.css
diff --git a/chaos-docs/src/css/custom.css → docs/src/css/custom.css b/chaos-docs/src/css/custom.css → docs/src/css/custom.css
diff --git a/chaos-docs/src/pages/index.module.css → docs/src/pages/index.module.css b/chaos-docs/src/pages/index.module.css → docs/src/pages/index.module.css
diff --git a/chaos-docs/src/pages/index.tsx → docs/src/pages/index.tsx b/chaos-docs/src/pages/index.tsx → docs/src/pages/index.tsx
diff --git a/chaos-docs/static/.nojekyll → docs/static/.nojekyll b/chaos-docs/static/.nojekyll → docs/static/.nojekyll
diff --git a/chaos-docs/static/img/chaos.png → docs/static/img/chaos.png b/chaos-docs/static/img/chaos.png → docs/static/img/chaos.png
diff --git a/chaos-docs/static/img/favicon.ico → docs/static/img/favicon.ico b/chaos-docs/static/img/favicon.ico → docs/static/img/favicon.ico
diff --git a/chaos-docs/tsconfig.json → docs/tsconfig.json b/chaos-docs/tsconfig.json → docs/tsconfig.json
diff --git a/chaos-docs/yarn.lock → docs/yarn.lock b/chaos-docs/yarn.lock → docs/yarn.lock
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -4,30 +4,31 @@ FROM node:18.16.0-alpine as builder
 # Set the current working directory inside the container
 WORKDIR /app
 
-COPY package.json yarn.lock ./
+COPY frontend/package.json frontend/yarn.lock ./
 RUN yarn install --frozen-lockfile
 
 ARG VITE_API_BASE_URL
 ARG VITE_OAUTH_CALLBACK_URL
 ENV VITE_API_BASE_URL $VITE_API_BASE_URL
 ENV VITE_OAUTH_CALLBACK_URL $VITE_OAUTH_CALLBACK_URL
 
-COPY . .
+COPY frontend ./
 
 RUN yarn run build
 
 FROM node:18.16.0-alpine as chaos-docs-builder
 
-WORKDIR /chaos-docs
+WORKDIR /docs
 
-# Copy chaos-docs package.json and yarn.lock
-COPY ../chaos-docs/package.json ../chaos-docs/yarn.lock ./
+# Copy chaos-docs files and install dependencies
+COPY docs/package.json docs/yarn.lock ./
 RUN yarn install --frozen-lockfile
 
 # Copy the rest of the chaos-docs files and build
-COPY ../chaos-docs ./
-RUN npm run generate-docs
-RUN npm run build
+COPY docs ./
+RUN yarn run generate-docs
+RUN yarn run build
+
 
 # nginx state for serving content
 FROM nginx:1.25.0-alpine
@@ -38,7 +39,7 @@ WORKDIR /usr/share/nginx/html
 RUN rm -rf ./*
 # Copy static assets from builder stage
 COPY --from=builder /app/dist .
-COPY --from=chaos-docs-builder /chaos-docs/dist ./chaos-docs
+COPY --from=chaos-docs-builder /docs/dist ./docs
 
 EXPOSE 80