#11 Remove support for the fdcastel image

Author: mrotteveel

CHANGES.md

@@ -6,6 +6,8 @@ vNext
 - Updated org.testcontainers:jdbc to 1.21.0
 - Updated various test-dependencies
 - Updated Maven build plugins
+- Support for the _fdcastel_ image was removed as it is no longer available. \
+  You'll need to switch to the _project_ image (`firebirdsql/firebird`).
 
 1.5.1
 -----

src/main/java/org/firebirdsql/testcontainers/FirebirdContainer.java

@@ -12,7 +12,7 @@
 /**
  * Testcontainers implementation for Firebird.
  * <p>
- * Supported image: {@code jacobalberty/firebird}, {@code firebirdsql/firebird}, {@code ghcr.io/fdcastel/firebird}.
+ * Supported image: {@code jacobalberty/firebird}, {@code firebirdsql/firebird}.
  * <p>
  * Exposed ports: 3050
  */
@@ -24,19 +24,9 @@ public class FirebirdContainer<SELF extends FirebirdContainer<SELF>> extends Jdb
     public static final String ALTERNATE_NAME = "firebirdsql";
     public static final String PROJECT_IMAGE = "firebirdsql/firebird";
     public static final String JACOB_ALBERTY_IMAGE = "jacobalberty/firebird";
-    /**
-     * @deprecated Use {@link #PROJECT_IMAGE}
-     */
-    @Deprecated
-    public static final String FDCASTEL_IMAGE = "ghcr.io/fdcastel/firebird";
     public static final String IMAGE = JACOB_ALBERTY_IMAGE;
     static final DockerImageName PROJECT_IMAGE_NAME = DockerImageName.parse(PROJECT_IMAGE);
     static final DockerImageName JACOB_ALBERTY_IMAGE_NAME = DockerImageName.parse(JACOB_ALBERTY_IMAGE);
-    /**
-     * @deprecated Use {@link #PROJECT_IMAGE_NAME}
-     */
-    @Deprecated
-    static final DockerImageName FDCASTEL_IMAGE_NAME = DockerImageName.parse(FDCASTEL_IMAGE);
     static final DockerImageName DEFAULT_IMAGE_NAME = JACOB_ALBERTY_IMAGE_NAME;
     public static final String DEFAULT_TAG = "v4.0.2";
 
@@ -79,7 +69,7 @@ public FirebirdContainer(String dockerImageName) {
      */
     public FirebirdContainer(DockerImageName dockerImageName) {
         super(dockerImageName);
-        dockerImageName.assertCompatibleWith(PROJECT_IMAGE_NAME, JACOB_ALBERTY_IMAGE_NAME, FDCASTEL_IMAGE_NAME);
+        dockerImageName.assertCompatibleWith(PROJECT_IMAGE_NAME, JACOB_ALBERTY_IMAGE_NAME);
 
         addExposedPort(FIREBIRD_PORT);
     }
@@ -135,8 +125,7 @@ public String getDatabaseName() {
             }
             return databaseName;
             case PROJECT:
-            case FDCASTEL:
-                // The fdcastel/firebird images require an absolute path to access the database
+                // The firebirdsql/firebird images require an absolute path to access the database
                 // Provide this value only when the container is running
                 if (databaseName.charAt(0) != '/') {
                     return "/var/lib/firebird/data/" + databaseName;
@@ -300,22 +289,7 @@ void setWireCryptEnabled(FirebirdContainer<?> container) {
                 container.addEnv("EnableWireCrypt", "true");
             }
         },
-        FDCASTEL {
-            @Override
-            void setUserAndPassword(FirebirdContainer<?> container) {
-                PROJECT.setUserAndPassword(container);
-            }
-
-            @Override
-            void enableLegacyAuth(FirebirdContainer<?> container) {
-                PROJECT.enableLegacyAuth(container);
-            }
-
-            @Override
-            void setWireCryptEnabled(FirebirdContainer<?> container) {
-                PROJECT.setWireCryptEnabled(container);
-            }
-        };
+        ;
 
         void setTimeZone(FirebirdContainer<?> container) {
             container.addEnv("TZ", container.timeZone);
@@ -337,11 +311,9 @@ static ImageVariant of(String imageNameString) {
                 return PROJECT;
             } else if (imageName.isCompatibleWith(JACOB_ALBERTY_IMAGE_NAME)) {
                 return JACOBALBERTY;
-            } else if (imageName.isCompatibleWith(FDCASTEL_IMAGE_NAME)) {
-                return FDCASTEL;
             }
             // Assume the default
-            return JACOBALBERTY;
+            return PROJECT;
         }
 
     }

src/test/java/org/firebirdsql/testcontainers/FirebirdContainerTest.java

@@ -12,7 +12,6 @@
 import java.util.stream.Stream;
 
 import static org.firebirdsql.testcontainers.FirebirdContainer.FIREBIRD_PORT;
-import static org.firebirdsql.testcontainers.FirebirdTestImages.FDCASTEL_TEST_IMAGE;
 import static org.firebirdsql.testcontainers.FirebirdTestImages.FIREBIRD_259_SC_IMAGE;
 import static org.firebirdsql.testcontainers.FirebirdTestImages.FIREBIRD_259_SS_IMAGE;
 import static org.firebirdsql.testcontainers.FirebirdTestImages.FIREBIRD_TEST_IMAGE;
@@ -229,11 +228,10 @@ void testWithAdditionalUrlParamInJdbcUrl(DockerImageName imageName) {
     }
 
     static Stream<DockerImageName> defaultTestImages() {
-        return Stream.of(PROJECT_TEST_IMAGE, FIREBIRD_TEST_IMAGE, FDCASTEL_TEST_IMAGE);
+        return Stream.of(PROJECT_TEST_IMAGE, FIREBIRD_TEST_IMAGE);
     }
 
     static Stream<DockerImageName> projectCompatibleImages() {
-        // NOTE: Note sure how long FDCASTEL remains compatible with PROJECT
-        return Stream.of(PROJECT_TEST_IMAGE, FDCASTEL_TEST_IMAGE);
+        return Stream.of(PROJECT_TEST_IMAGE);
     }
 }

src/test/java/org/firebirdsql/testcontainers/FirebirdTestImages.java

@@ -7,10 +7,8 @@ public final class FirebirdTestImages {
     public static final DockerImageName FIREBIRD_402_IMAGE = FirebirdContainer.DEFAULT_IMAGE_NAME.withTag("v4.0.2");
     public static final DockerImageName FIREBIRD_259_SC_IMAGE = FirebirdContainer.DEFAULT_IMAGE_NAME.withTag("2.5.9-sc");
     public static final DockerImageName FIREBIRD_259_SS_IMAGE = FirebirdContainer.DEFAULT_IMAGE_NAME.withTag("2.5.9-ss");
-    public static final DockerImageName FDCASTEL_501_IMAGE = FirebirdContainer.FDCASTEL_IMAGE_NAME.withTag("5.0.1");
     public static final DockerImageName PROJECT_501_IMAGE = FirebirdContainer.PROJECT_IMAGE_NAME.withTag("5.0.1");
     public static final DockerImageName FIREBIRD_TEST_IMAGE = FIREBIRD_402_IMAGE;
-    public static final DockerImageName FDCASTEL_TEST_IMAGE = FDCASTEL_501_IMAGE;
     public static final DockerImageName PROJECT_TEST_IMAGE = PROJECT_501_IMAGE;
 
     private FirebirdTestImages() {