diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..7347a7f
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,25 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/bin
+**/charts
+**/docker-compose*
+**/compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000..bbe3554
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,19 @@
+{
+    // Usare IntelliSense per informazioni sui possibili attributi.
+    // Al passaggio del mouse vengono visualizzate le descrizioni degli attributi esistenti.
+    // Per altre informazioni, visitare: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        
+        
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Launch Program",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "program": "${workspaceFolder}/advanced-integration/server.js"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..8994575
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,4 @@
+FROM docker/whalesay:latest
+LABEL Name=googlepay Version=0.0.1
+RUN apt-get -y update && apt-get install -y fortunes
+CMD ["sh", "-c", "/usr/games/fortune -a | cowsay"]
diff --git a/advanced-integration/.env.example b/advanced-integration/.env.example
deleted file mode 100644
index 0fb8a60..0000000
--- a/advanced-integration/.env.example
+++ /dev/null
@@ -1,5 +0,0 @@
-# Create an application to obtain credentials at
-# https://developer.paypal.com/dashboard/applications/sandbox
-
-PAYPAL_CLIENT_ID="YOUR_CLIENT_ID_GOES_HERE"
-PAYPAL_CLIENT_SECRET="YOUR_SECRET_GOES_HERE"
diff --git a/advanced-integration/package.json b/advanced-integration/package.json
index 41e3ccd..3e9ddfa 100644
--- a/advanced-integration/package.json
+++ b/advanced-integration/package.json
@@ -12,7 +12,7 @@
   "author": "",
   "license": "Apache-2.0",
   "dependencies": {
-    "dotenv": "^16.0.0",
+    "dotenv": "^16.4.5",
     "ejs": "^3.1.6",
     "express": "^4.17.3",
     "node-fetch": "^3.2.1"
diff --git a/advanced-integration/server.js b/advanced-integration/server.js
index 0def822..ba41c26 100644
--- a/advanced-integration/server.js
+++ b/advanced-integration/server.js
@@ -1,18 +1,21 @@
 import "dotenv/config";
 import express from "express";
 import * as paypal from "./paypal-api.js";
+//require('dotenv').config(); //dani 25 giu
 const {PORT = 8888} = process.env;
 
 const app = express();
-app.set("view engine", "ejs");
+app.set("view engine", "ejs"); //if "view engine" is not set "ejs" is the default
 app.use(express.static("public"));
 
 // render checkout page with client id & unique client token
 app.get("/", async (req, res) => {
-  const clientId = process.env.PAYPAL_CLIENT_ID, merchantId = process.env.PAYPAL_MERCHANT_ID;
+  const clientId = process.env.PAYPAL_CLIENT_ID
+  const merchantId = process.env.PAYPAL_MERCHANT_ID; //testare
   const clientSecret = process.env.PAYPAL_CLIENT_SECRET;
+  const mymerchantId = process.env.PAYPAL_MERCHANT_ID;
   try {
-    if (!clientId || !merchantId ||  !clientSecret){
+    if (!clientId || !mymerchantId ||  !clientSecret){
       throw new Error("Client Id or App Secret or Merchant Id is missing.");
     }
     const clientToken = await paypal.generateClientToken();
diff --git a/advanced-integration/views/checkout.ejs b/advanced-integration/views/checkout.ejs
index 59932ad..f838fba 100644
--- a/advanced-integration/views/checkout.ejs
+++ b/advanced-integration/views/checkout.ejs
@@ -31,7 +31,7 @@
     <script src="https://pay.google.com/gp/p/js/pay.js"></script>
     <!-- Include PayPal SDK Script with components=googlepay for Custom Googlepay Component-->
     <script
-      src="https://www.paypal.com/sdk/js?components=googlepay&client-id=<%= clientId %>&merchant-id=<%= merchantId %>"
+      src="https://www.paypal.com/sdk/js?components=googlepay&client-id=<%= clientId %>&merchant-id=<%= mymerchantId %>"
       data-client-token="<%= clientToken %>" data-partner-attribution-id="GOOGLEPAY"
     ></script>
 
diff --git a/docker-compose.debug.yml b/docker-compose.debug.yml
new file mode 100644
index 0000000..1763ad1
--- /dev/null
+++ b/docker-compose.debug.yml
@@ -0,0 +1,8 @@
+version: '3.4'
+
+services:
+  googlepay:
+    image: googlepay
+    build:
+      context: .
+      dockerfile: ./Dockerfile
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..1763ad1
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,8 @@
+version: '3.4'
+
+services:
+  googlepay:
+    image: googlepay
+    build:
+      context: .
+      dockerfile: ./Dockerfile