Merge branch 'aws'

Author: reloni

.travis.yml

@@ -5,6 +5,10 @@ services:
 
 language: generic
 
+before_install:
+  - pip install --user awscli
+  - export PATH=$PATH:$HOME/.local/bin
+
 script:
 #  - if [ "$TRAVIS_TAG" != "" ]; then
 #    docker run -it --rm -v $TRAVIS_BUILD_DIR:/sources microsoft/dotnet:1.1.0-sdk-msbuild bash /sources/scripts/PublishDebug.sh;

Dockerfile.debug

@@ -1,5 +1,14 @@
 FROM microsoft/dotnet:1.1.0-runtime
 
+# Install the AWS CLI
+RUN apt-get update && \
+    apt-get -y install python curl unzip && cd /tmp && \
+    curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" \
+    -o "awscli-bundle.zip" && \
+    unzip awscli-bundle.zip && \
+    ./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws && \
+    rm awscli-bundle.zip && rm -rf awscli-bundle
+
 # Copy our code to the "/app" folder in our container
 WORKDIR /app
 COPY ./published/debug .
@@ -9,7 +18,11 @@ ENV ASPNETCORE_URLS http://+:5000
 EXPOSE 5000
 
 ENV ASPNETCORE_ENVIRONMENT Development
-ENV db-connection-string ConnectionString_dockerContainer
+ENV CONNECTIONSTRINGNAME ConnectionString_Postgres
+
+COPY ./Scripts/secrets-entrypoint.sh /secrets-entrypoint.sh
+ENTRYPOINT ["/secrets-entrypoint.sh"]
 
 # Run the dotnet application against a DLL from within the container
-ENTRYPOINT ["dotnet", "SimpleToDoService.dll"]
+#ENTRYPOINT ["dotnet", "SimpleToDoService.dll"]
+CMD [dotnet, "SimpleToDoService.dll"]

RequestTests.paw

@@ -1,19 +1,34 @@
 #!/bin/sh
-set -ev
+set -e
 
 if [ "${TRAVIS_TAG}" != "" ]; then
+
   docker run -it -d --name builder microsoft/dotnet:1.1.0-sdk-msbuild tail -f /dev/null
-  echo "try ls"
-  docker exec builder bash -c 'ls'
   docker cp src/SimpleToDoService builder:app
   docker exec builder bash -c 'cd /app; dotnet restore; dotnet publish -o "../published/debug"'
   docker cp builder:published published
+
+  #push to AWS
+  aws ecr get-login --region eu-central-1 > login
+  eval "$(cat login)"
+  export REPO=${DOCKER_AWS_REPONAME}
+  export TAG=empty-${TRAVIS_TAG}
+  docker build -f Dockerfile.debug -t $REPO:$TAG .
+  docker tag $REPO:$TAG $REPO:latest
+  docker push $REPO > PushLog.log
+  echo "AWS push log ===="
+  cat PushLog.log
+  echo "======"
+
+  #push to docker-hub
   docker login -u ${DOCKER_USER} -p ${DOCKER_PASS}
   export REPO=reloni/todo-service
-  export TAG=Debug-${TRAVIS_TAG}
   docker build -f Dockerfile.debug -t $REPO:$TAG .
   docker tag $REPO:$TAG $REPO:latest
-  docker push $REPO
+  docker push $REPO > PushLog.log
+  echo "Docker hub push log ===="
+  cat PushLog.log
+  echo "======"
 fi
 
 exit 0;

Scripts/BuildImage.sh

@@ -0,0 +1,4 @@
+docker run -d --name task-manager-service -p 5000:5000 -e POSTGRES_PASSWORD=test -e POSTGRES_USER=taskmanager -e POSTGRES_DB=tasksdb -e POSTGRES_HOST=localhost -e POSTGRES_PORT=5432 reloni/todo-service:latest
+
+
+docker run -d --name task-manager-service -p 5000:5000 -e POSTGRES_PASSWORD=test -e POSTGRES_USER=taskmanager -e POSTGRES_DB=tasksdb -e POSTGRES_HOST=localhost -e POSTGRES_PORT=5432 test-todo

Scripts/RunContainer.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [ "$LOAD_S3_SECRETS" = "YES" ]; then
+  # Load the S3 secrets file contents into the environment variables
+  eval $(aws s3 --region ${SECRETS_BUCKET_REGION} cp s3://${SECRETS_BUCKET_NAME}/${SECRETS_FILE_NAME} - | sed 's/^/export /')
+fi
+
+dotnet SimpleToDoService.dll

Scripts/secrets-entrypoint.sh

@@ -7,8 +7,9 @@
       "Microsoft": "Information"
     }
   },
-  "DbContextSettings" :{ 
+  "DbContextSettings" :{
         "ConnectionString_localhost" : "User ID=postgres;Password=pass;Host=localhost;Port=5432;Database=postgres;Pooling=true;",
-        "ConnectionString_dockerContainer" : "User ID=postgres;Password=pass;Host=db;Port=5432;Database=postgres;Pooling=true;"
+        "ConnectionString_dockerContainer" : "User ID=postgres;Password=pass;Host=db;Port=5432;Database=postgres;Pooling=true;",
+        "ConnectionString_Postgres" : "User ID={USER_ID};Password={PASSWORD};Host={HOST};Port={PORT};Database={DB};Pooling=true;"
   }
 }

src/SimpleToDoService/AppSettings.json

@@ -39,8 +39,12 @@ public void ConfigureServices(IServiceCollection services)
 
 
 
-			var connectionString = Configuration[string.Format("DbContextSettings:{0}", 
-			                                                   Environment.GetEnvironmentVariable("db-connection-string"))];
+			var connectionString = Configuration["DbContextSettings:ConnectionString_Postgres"];
+			connectionString = connectionString.Replace("{USER_ID}", Environment.GetEnvironmentVariable("POSTGRES_USER"))
+			                                   .Replace("{PASSWORD}", Environment.GetEnvironmentVariable("POSTGRES_PASSWORD"))
+			                                   .Replace("{DB}", Environment.GetEnvironmentVariable("POSTGRES_DB"))
+			                                   .Replace("{HOST}", Environment.GetEnvironmentVariable("POSTGRES_HOST"))
+			                                   .Replace("{PORT}", Environment.GetEnvironmentVariable("POSTGRES_PORT"));
 
 			services.AddDbContext<ToDoDbContext>(opts => opts.UseNpgsql(connectionString));
 			services.AddScoped<IToDoDbContext, ToDoDbContext>();
@@ -59,4 +63,4 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
 			app.UseMvc();
 		}
 	}
-}
+}