Skip to content

Commit

Permalink
Merge pull request #87 from wireapp/staging
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
dkovacevic authored Jul 19, 2022
2 parents f6f81c7 + 404a987 commit dac676f
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 14 deletions.
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,13 @@ COPY backend/ ./

RUN mvn -Dmaven.test.skip=true package

FROM wirebot/runtime AS runtime
FROM wirebot/runtime:1.1.1 AS runtime
LABEL description="Wire Roman"
LABEL project="wire-bots:roman"

# update dependencies in the base image
RUN apt-get update && apt-get upgrade -y

# Copy backend
COPY --from=build /app/target/roman.jar /opt/roman/backend/
COPY backend/roman.yaml /etc/roman/
Expand Down
24 changes: 12 additions & 12 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion frontend/src/app/pages/home/components/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export default function Header() {
const styles = useStyles();
return (
<div className={styles.header}>
<Button href={`${romanBasePath}/swagger`} target="_blank">Wire Roman Swagger</Button>
<Button href={`${romanBasePath}swagger`} target="_blank">Wire Roman Swagger</Button>

<Button onClick={logout}>Logout - {user}</Button>
</div>
Expand Down

0 comments on commit dac676f

Please sign in to comment.