Merge remote-tracking branch 'upstream/main' into dev

tapas-auction-house/BROKERS.md

@@ -14,10 +14,8 @@ Running this WebSub Hub implementation requires Docker, Node.js, and npm:
 ### How to run
 
 ```shell
-git clone https://github.com/hemerajs/websub-hub.git
-cd websub-hub
-docker run -d -p 27017:27017 -p 28017:28017 -e AUTH=no tutum/mongodb
-npm i -g websub-hub-cli
+docker run -d -p 27017:27017 -p 28017:28017 -e AUTH=no mongo:latest
+npm i -g websub-hub
 websub-hub -l info -m mongodb://localhost:27017/hub
 ```
 

tapas-auction-house/Dockerfile

@@ -0,0 +1,13 @@
+# Dockerfile/Docker-Compose file based on an initial version authored by Alexander Lontke (ASSE, Fall Semester 2021)
+
+FROM maven as build
+
+COPY . /app
+
+RUN mvn -f app/pom.xml --batch-mode --update-snapshots verify
+
+FROM openjdk
+
+COPY --from=build /app/target/tapas-auction-house-0.0.1-SNAPSHOT.jar ./tapas-auction-house-0.0.1-SNAPSHOT.jar
+
+CMD java -jar tapas-auction-house-0.0.1-SNAPSHOT.jar

tapas-auction-house/src/main/java/ch/unisg/tapas/TapasAuctionHouseApplication.java

@@ -29,6 +29,7 @@ public class TapasAuctionHouseApplication {
 
     private static ConfigurableEnvironment ENVIRONMENT;
 
+
     public static void main(String[] args) {
 		SpringApplication tapasAuctioneerApp = new SpringApplication(TapasAuctionHouseApplication.class);
         ENVIRONMENT = tapasAuctioneerApp.run(args).getEnvironment();

tapas-auction-house/src/main/resources/application.properties

@@ -1,5 +1,7 @@
 server.port=8086
 
+broker.mqtt=tcp://broker.hivemq.com
+
 websub.hub=https://websub.appspot.com/
 websub.hub.publish=https://websub.appspot.com/