Skip to content

Commit

Permalink
Merge remote-tracking branch 'idsa/develop' into idsa-main
Browse files Browse the repository at this point in the history
  • Loading branch information
SebastianOpriel committed Jul 4, 2022
2 parents 035a238 + a04c967 commit c8d2d88
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-deploy-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
IMAGE_NAME: International-Data-Spaces-Association/dataspace-connector-ui

jobs:
build-and-push-image:
Expand Down Expand Up @@ -53,4 +53,4 @@ jobs:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
labels: ${{ steps.meta.outputs.labels }}
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ All notable changes to this project will be documented in this file.
- Raised a broad range of comparisons of variables from value to type level
- Validation for database URLs does not require http prefix
- Opening browser in dev mode on wrong URL (0.0.0.0 instead of localhost)
- Adjust image name to `dataspace-connector-ui`
- Add image source `https://github.com/International-Data-Spaces-Association/DataspaceConnectorUI` to Dockerfile

### Removed
- Unused imports
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM node:14
LABEL org.opencontainers.image.source = "https://github.com/International-Data-Spaces-Association/DataspaceConnectorUI"
WORKDIR /usr/src/app
COPY package*.json ./
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion buildDockerImage.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
sudo docker build -t dataspaceconnector-ui .
sudo docker build -t dataspace-connector-ui .
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
version: '3.5'

services:
dataspaceconnector-ui:
image: dataspaceconnector-ui
dataspace-connector-ui:
image: dataspace-connector-ui
environment:
- CONNECTOR_URL=https://localhost:8080
- CONNECTOR_USER=admin
Expand Down
4 changes: 2 additions & 2 deletions 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 package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "dataspaceconnector-ui",
"name": "dataspace-connector-ui",
"version": "10.0.0",
"private": true,
"scripts": {
Expand Down

0 comments on commit c8d2d88

Please sign in to comment.