Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#179 update ci profile to use fabric8 for multi-platform docker build #187

Merged
merged 1 commit into from
Jul 8, 2024

Conversation

csun-cpointe
Copy link
Contributor

No description provided.

@@ -45,21 +45,12 @@ public class HashingSteps {
private static final Logger logger = LoggerFactory.getLogger(HashingSteps.class);
private final GenericContainer<?> genericContainer = new GenericContainer<>(
DockerImageName.parse(
"ghcr.io/boozallen/aissemble-vault:" + System.getProperty("version.aissemble.vault") + this.getSystemArchitectureTag()
"ghcr.io/boozallen/aissemble-vault:" + System.getProperty("version.aissemble.vault")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I: remove the system architecture from the tag

@csun-cpointe csun-cpointe force-pushed the 179-enable-ci-multi-archtecture-build branch from baf1da4 to dc8aa89 Compare July 3, 2024 18:06
@@ -3,7 +3,7 @@ services:
vault:
# For testing we will pull the image directly from the remote server as opposed to a locally built image.
# This will ensure that the Vault keys are in sync.
image: "ghcr.io/boozallen/aissemble-vault:${version.aissemble}-amd64"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I: remove the system architecture from the tag

@@ -75,7 +68,7 @@ def before_feature(context, feature):
f"Starting services defined in Docker Compose file at {test_staging_path}"
)

compose = DockerCompose(test_staging_path, select_docker_compose_arch())
compose = DockerCompose(test_staging_path, "docker-compose.yml")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I: We don't need different docker compose files anymore since we don't need to specify the system architecture for the docker image

</plugins>
</pluginManagement>
</build>
</profile>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I: remove system architecture specific profile since fabric8 will build both platforms

@csun-cpointe csun-cpointe force-pushed the 179-enable-ci-multi-archtecture-build branch 3 times, most recently from f5b09a4 to ca56138 Compare July 5, 2024 16:50
default: return "-amd64";
}
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I: removing the system architecture specific image tag

@csun-cpointe csun-cpointe marked this pull request as ready for review July 5, 2024 20:19
<executions>
<execution>
<id>default-push</id>
<configuration>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

S: Instead of duplicating the build_args, we should just move the config block below from the default-build execution to the plugin root.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, the execution doesn't recognize the configuration after removing the execution id so will continue with this approach

<SPARK_VERSION>${version.spark}</SPARK_VERSION>
</args>
<contextDir>${project.basedir}</contextDir>
<dockerFile>./src/main/resources/docker/Dockerfile</dockerFile>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this configuration needed? Looks the same as the config specified in the build-parent/pom.xml.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, unfortunately.

Copy link
Contributor

@carter-cundiff carter-cundiff Jul 8, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh this is <id>default-push</id> instead of <id>default-build</id>, so makes since to have to duplicate them.

@csun-cpointe csun-cpointe force-pushed the 179-enable-ci-multi-archtecture-build branch from ca56138 to af247b7 Compare July 8, 2024 16:10
@csun-cpointe csun-cpointe merged commit 68f94d1 into dev Jul 8, 2024
@csun-cpointe csun-cpointe deleted the 179-enable-ci-multi-archtecture-build branch July 8, 2024 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants