Artifact Submission

Author: valentinbootz

.github/workflows/build.yml

@@ -19,8 +19,7 @@ jobs:
     name: Build and Test
     uses: Apodini/.github/.github/workflows/build-and-test.yml@v1
     with:
-      packagename: ApodiniTemplate
-      testdocc: false
+      packagename: ApodiniSustainabilityDemo
   docker-compose-test:
     name: Docker Compose Test
     uses: Apodini/.github/.github/workflows/docker-compose-test.yml@v1

.github/workflows/pull_request.yml

@@ -17,7 +17,7 @@ jobs:
     name: Build and Test
     uses: Apodini/.github/.github/workflows/build-and-test.yml@v1
     with:
-      packagename: ApodiniTemplate
+      packagename: ApodiniSustainabilityDemo
   reuse_action:
     name: REUSE Compliance Check
     uses: Apodini/.github/.github/workflows/reuse.yml@v1

.github/workflows/release.yml

@@ -23,4 +23,4 @@ jobs:
     name: Docker Build and Push
     uses: Apodini/.github/.github/workflows/docker-build-and-push.yml@v1
     with:
-      image-name: apodini/template
+      image-name: apodini/sustainability

Dockerfile

@@ -33,18 +33,7 @@ RUN swift build -c release
 WORKDIR /staging
 
 # Copy main executable to staging area
-RUN cp "$(swift build --package-path /build -c release --show-bin-path)/WebService" ./
-
-# Copy resources from the resources directory if the directories exist
-# Ensure that by default, neither the directory nor any of its contents are writable.
-RUN [ -d "$(swift build --package-path /build -c release --show-bin-path)/Apodini_ApodiniOpenAPI.resources" ] \
-    && mv "$(swift build --package-path /build -c release --show-bin-path)/Apodini_ApodiniOpenAPI.resources" ./ \
-    && chmod -R a-w ./Apodini_ApodiniOpenAPI.resources \
-    || echo No resources to copy
-RUN [ -d "$(swift build --package-path /build -c release --show-bin-path)/WebService_ApodiniTemplate.resources" ] \
-    && mv "$(swift build --package-path /build -c release --show-bin-path)/WebService_ApodiniTemplate.resources" ./ \
-    && chmod -R a-w ./WebService_ApodiniTemplate.resources \
-    || echo No resources to copy
+RUN cp "$(swift build --package-path /build -c release --show-bin-path)/FlightBooking" ./
 
 # ================================
 # Run image
@@ -70,5 +59,4 @@ COPY --from=build --chown=apodini:apodini /staging /app
 USER apodini:apodini
 
 # Start the Apodini service when the image is run.
-# The default port is 80. Can be adapted using the `--port` argument
-ENTRYPOINT ["./WebService"]
+ENTRYPOINT ["./FlightBooking"]

Package.resolved

@@ -12,32 +12,33 @@ import PackageDescription
 
 
 let package = Package(
-    name: "ApodiniTemplate",
+    name: "ApodiniSustainabilityDemo",
     platforms: [
-        .macOS(.v11)
+        .macOS(.v12)
     ],
     products: [
         .executable(
-            name: "WebService",
-            targets: ["WebService"]
+            name: "FlightBooking",
+            targets: ["FlightBooking"]
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/Apodini/Apodini.git", .upToNextMinor(from: "0.9.1"))
+        .package(url: "https://github.com/Apodini/Apodini.git", .upToNextMinor(from: "0.9.1")),
+        .package(url: "https://github.com/Apodini/ApodiniSustainability.git", .branch("develop"))
     ],
     targets: [
         .executableTarget(
-            name: "WebService",
+            name: "FlightBooking",
             dependencies: [
                 .product(name: "Apodini", package: "Apodini"),
                 .product(name: "ApodiniREST", package: "Apodini"),
-                .product(name: "ApodiniOpenAPI", package: "Apodini")
+                .product(name: "ApodiniSustainability", package: "ApodiniSustainability")
             ]
         ),
         .testTarget(
-            name: "WebServiceTests",
+            name: "FlightBookingTests",
             dependencies: [
-                .target(name: "WebService")
+                .target(name: "FlightBooking")
             ]
         )
     ]