feat: Switch to Portainer CE (#65)

BREAKING CHANGE: This change is treated by Portainer team as breaking change - switching to a different base image
homecentr · Aug 10, 2021 · f167624 · f167624
1 parent 54f22ce
commit f167624
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM portainer/portainer:1.24.2 as portainer
+FROM portainer/portainer-ce:2.6.2-alpine as portainer
 
 FROM homecentr/base:3.1.1-alpine
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,14 +5,15 @@ services:
     command: ping 127.0.0.1
     networks:
       deps:
+
   portainer:
     build: .
     image: homecentr/portainer
     restart: unless-stopped
     networks:
       deps:
     environment:
-      PORTAINER_ARGS: "--no-auth"
+      PORTAINER_ARGS: ""
       # WAIT_FOR_NS_RECORD: "dependency"
       # WAIT_FOR_NS_RECORD_TIMEOUT: 30
     # healthcheck:
@@ -22,5 +23,5 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
 
-# networks:
-#   deps:  
+networks:
+  deps:
diff --git a/tests/build.gradle b/tests/build.gradle
@@ -29,6 +29,7 @@ dependencies {
 
 test {
     systemProperty 'docker_image_tag', System.getProperty('docker_image_tag')
+
     afterTest { desc, result ->
         logger.quiet "Executing test ${desc.name} [${desc.className}] with result: ${result.resultType}"
     }

diff --git a/tests/src/test/java/PortainerContainerShould.java b/tests/src/test/java/PortainerContainerShould.java
@@ -14,10 +14,7 @@ public class PortainerContainerShould {
 
     @BeforeClass
     public static void beforeClass() {
-        HashMap<String, String> envVars = new HashMap();
-        envVars.put("PORTAINER_ARGS", "--no-auth");
-
-        Controller.start(envVars, true);
+        Controller.start(new HashMap(), true);
     }
 
     @AfterClass