Merge remote-tracking branch 'origin/17-database-create-temporal-tables' into...

Merge remote-tracking branch 'origin/17-database-create-temporal-tables' into 74-error-on-create-database-after-merge-at-dev


Former-commit-id: 0f60a43d

fda-container-service/services/src/main/java/at/tuwien/service/ImageService.java

@@ -66,6 +66,7 @@ public class ImageService {
             log.error("image already exists: {}", createDto);
             throw new ImageAlreadyExistsException("image already exists");
         }
+        log.debug("created image {}", out);
         return out;
     }
 
@@ -115,10 +116,10 @@ public class ImageService {
     }
 
     private void pull(String repository, String tag) throws ImageNotFoundException {
+        log.debug("pulling image {}:{}", repository, tag);
         final ResultCallback.Adapter<PullResponseItem> response;
         try {
-            response = dockerClient.pullImageCmd("library")
-                    .withRepository(repository)
+            response = dockerClient.pullImageCmd(repository)
                     .withTag(tag)
                     .start();
             final Instant now = Instant.now();

fda-gateway-service/src/main/java/at/tuwien/gatewayservice/config/GatewayConfig.java

@@ -11,18 +11,26 @@ public class GatewayConfig {
     @Bean
     public RouteLocator routes(RouteLocatorBuilder builder) {
         return builder.routes()
-                .route("container-service", r -> r.path("/api/container/**")
+                .route("fda-container-service", r -> r.path("/api/container/**")
+                        .and()
+                        .method("POST","GET","PUT","DELETE")
                         .and()
                         .uri("lb://fda-container-service"))
-                .route("table-service", r -> r.path("/api/database/{id}/table/**")
+                .route("fda-container-service", r -> r.path("/api/image/**")
                         .and()
-                        .uri("lb://fda-table-service"))
-                .route("database-service", r -> r.path("/api/database/**")
+                        .method("POST","GET","PUT","DELETE")
+                        .and()
+                        .uri("lb://fda-container-service"))
+                .route("fda-database-service", r -> r.path("/api/database/**")
+                        .and()
+                        .method("POST","GET","PUT","DELETE")
                         .and()
                         .uri("lb://fda-database-service"))
-                .route("query-service", r -> r.path("/api/query/**")
+                .route("fda-table-service", r -> r.path("/api/database/**/table/**")
+                        .and()
+                        .method("POST","GET","PUT","DELETE")
                         .and()
-                        .uri("lb://fda-query-service"))
+                        .uri("lb://fda-table-service"))
                 .build();
     }
 

fda-metadata-db/Dockerfile.temporal_tables

+FROM postgres:12.4-alpine
+
+RUN apk add --no-cache libpq make gcc clang llvm musl-dev python3-dev git
+
+ENV PG_CONFIG=/usr/local/bin/pg_config
+
+RUN git clone https://github.com/arkhipov/temporal_tables.git && cd temporal_tables && \
+    make && make install
+
+WORKDIR ./temporal_tables
+
+RUN echo "make installcheck PGUSER=postgres" > ./check.sh
+RUN chmod +x ./check.sh
+
+EXPOSE 5432
+
+CMD ["postgres"]
\ No newline at end of file

fda-metadata-db/api/src/main/java/at/tuwien/api/container/image/ImageCreateDto.java

@@ -22,6 +22,10 @@ public class ImageCreateDto {
     @ApiModelProperty(required = true, example = "latest")
     private String tag;
 
+    @NotNull
+    @ApiModelProperty(required = true, example = "false", notes = "when false, the service pulls it from hub.docker.com")
+    private Boolean local;
+
     @NotNull
     @ApiModelProperty(required = true, example = "5432")
     private Integer defaultPort;