Skip to content

Commit

Permalink
Merge pull request #96 from acelaya-forks/feature/update-deps
Browse files Browse the repository at this point in the history
Feature/update deps
  • Loading branch information
acelaya authored Jun 18, 2023
2 parents f1703d6 + b2598ec commit 4761ef6
Show file tree
Hide file tree
Showing 6 changed files with 3,419 additions and 1,248 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ jobs:
ci:
uses: shlinkio/github-actions/.github/workflows/web-app-ci.yml@main
with:
node-version: 18.12
node-version: 20.2
with-unit-tests: false
force-install: true
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org).

## [2.2.0] - 2023-06-18
### Added
* *Nothing*

### Changed
* Update to Swagger UI 5.0.0 and other dependencies

### Deprecated
* *Nothing*

### Removed
* *Nothing*

### Fixed
* *Nothing*


## [2.1.0] - 2023-03-05
### Added
* *Nothing*
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM node:18.12-alpine as node
FROM node:20.2-alpine as node
COPY . /shlink-api-spec
RUN cd /shlink-api-spec && \
npm ci --force && \
npm run build

FROM nginx:1.23-alpine
FROM nginx:1.25-alpine
LABEL maintainer="Alejandro Celaya <alejandro@alejandrocelaya.com>"
RUN rm -r /usr/share/nginx/html && rm /etc/nginx/conf.d/default.conf
COPY config/docker/nginx.conf /etc/nginx/conf.d/default.conf
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3'
services:
shlink_api_spec_ui:
container_name: shlink_api_spec_ui
image: node:18.12-alpine
image: node:20.2-alpine
command: /bin/sh -c "cd /shlink-api-spec && npm install -f && npm run start"
volumes:
- ./:/shlink-api-spec
Expand Down
Loading

0 comments on commit 4761ef6

Please sign in to comment.