Skip to content

Commit

Permalink
Merge pull request #317 from acelaya-forks/feature/runtimes-docs
Browse files Browse the repository at this point in the history
Feature/runtimes docs
  • Loading branch information
acelaya committed Sep 3, 2022
2 parents 0d388bc + 3ec7072 commit 7da3f1a
Show file tree
Hide file tree
Showing 28 changed files with 604 additions and 52 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Expand Up @@ -10,5 +10,5 @@ jobs:
ci:
uses: shlinkio/github-actions/.github/workflows/web-app-ci.yml@main
with:
node-version: 16.15
node-version: 16.17
force-install: true
2 changes: 1 addition & 1 deletion CHANGELOG.md
Expand Up @@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com), and this

## [Unreleased]
### Added
* *Nothing*
* [#315](https://github.com/shlinkio/shlink.io/issues/315) Documented support for RoadRunner.

### Changed
* Migrated to reusable workflow to build docker image
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
@@ -1,10 +1,10 @@
FROM node:16.15-alpine as node
FROM node:16.17-alpine as node
COPY . /shlink-website
RUN cd /shlink-website && \
npm ci --force && \
npm run export:prod

FROM nginx:1.21-alpine
FROM nginx:1.23-alpine
LABEL maintainer="Alejandro Celaya <alejandro@alejandrocelaya.com>"
RUN rm -r /usr/share/nginx/html && rm /etc/nginx/conf.d/default.conf
COPY --from=node /shlink-website/out /usr/share/nginx/html
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Expand Up @@ -3,8 +3,8 @@ version: '3'
services:
shlink_webstie_node:
container_name: shlink_webstie_node
image: node:16.15-alpine
command: /bin/sh -c "cd /shlink-website && npm install && npm run dev"
image: node:16.17-alpine
command: /bin/sh -c "cd /shlink-website && npm install -f && npm run dev"
volumes:
- ./:/shlink-website
ports:
Expand Down
12 changes: 8 additions & 4 deletions next.config.js → next.config.mjs
@@ -1,12 +1,16 @@
const withPlugins = require('next-compose-plugins');
const withFonts = require('next-fonts');
const withMDX = require('@next/mdx')({
import withPlugins from 'next-compose-plugins';
import withFonts from 'next-fonts';
import mdx from '@next/mdx';
import remarkGfm from 'remark-gfm'

const withMDX = mdx({
options: {
providerImportSource: '@mdx-js/react',
remarkPlugins: [remarkGfm],
}
});

module.exports = withPlugins([ withFonts, withMDX ], {
export default withPlugins([ withFonts, withMDX ], {
enableSvg: true,
trailingSlash: true, // Makes pages to be exported as index.html files
swcMinify: true, // This will make compiled assets to be minified via SWC instead of webpack plugin
Expand Down

0 comments on commit 7da3f1a

Please sign in to comment.