This repository has been archived by the owner on Jun 19, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 202
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix #825 : More flexible S2I binary build data format
- Loading branch information
1 parent
321b4b3
commit 32afdd1
Showing
28 changed files
with
510 additions
and
193 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
core/src/main/java/io/fabric8/maven/core/service/BinaryInputArchiveBuilder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /* | ||
| * Copyright 2016 Red Hat, Inc. | ||
| * | ||
| * Red Hat licenses this file to you under the Apache License, version | ||
| * 2.0 (the "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or | ||
| * implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package io.fabric8.maven.core.service; | ||
|
|
||
| import io.fabric8.maven.docker.config.ImageConfiguration; | ||
| import io.fabric8.maven.docker.service.ServiceHub; | ||
|
|
||
| import java.io.File; | ||
|
|
||
| public interface BinaryInputArchiveBuilder { | ||
| void createBinaryInput(ServiceHub hub, File targetDirectory, ImageConfiguration imageConfiguration) throws Fabric8ServiceException; | ||
| File getBinaryInputTar(); | ||
| } |
88 changes: 88 additions & 0 deletions
88
core/src/main/java/io/fabric8/maven/core/service/DefaultBinaryInputArchiveBuilder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| /* | ||
| * Copyright 2016 Red Hat, Inc. | ||
| * | ||
| * Red Hat licenses this file to you under the Apache License, version | ||
| * 2.0 (the "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or | ||
| * implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package io.fabric8.maven.core.service; | ||
|
|
||
| import io.fabric8.maven.core.util.IoUtil; | ||
| import io.fabric8.maven.docker.assembly.ArchiverCustomizer; | ||
| import io.fabric8.maven.docker.config.ImageConfiguration; | ||
| import io.fabric8.maven.docker.service.ServiceHub; | ||
| import org.apache.maven.plugin.MojoExecutionException; | ||
| import org.codehaus.plexus.archiver.tar.TarArchiver; | ||
|
|
||
| import java.io.File; | ||
| import java.io.FileWriter; | ||
| import java.io.IOException; | ||
| import java.io.PrintWriter; | ||
| import java.util.Map; | ||
|
|
||
| public class DefaultBinaryInputArchiveBuilder implements BinaryInputArchiveBuilder { | ||
|
|
||
| private BuildService.BuildServiceConfig config; | ||
| private File binaryInputTar = null; | ||
|
|
||
| public DefaultBinaryInputArchiveBuilder(BuildService.BuildServiceConfig config) { | ||
| this.config = config; | ||
| } | ||
|
|
||
| @Override | ||
| public void createBinaryInput(ServiceHub hub, File targetDir, ImageConfiguration imageConfiguration) throws Fabric8ServiceException { | ||
| // Adding S2I artifacts such as environment variables in S2I mode | ||
| ArchiverCustomizer customizer = getS2ICustomizer(imageConfiguration); | ||
|
|
||
| try { | ||
| // Create tar file with Docker archive | ||
| if (customizer != null) { | ||
| this.binaryInputTar = hub.getArchiveService().createDockerBuildArchive(imageConfiguration, config.getDockerMojoParameters(), customizer); | ||
| } else { | ||
| this.binaryInputTar = hub.getArchiveService().createDockerBuildArchive(imageConfiguration, config.getDockerMojoParameters()); | ||
| } | ||
| } catch (MojoExecutionException e) { | ||
| throw new Fabric8ServiceException("Unable to create the build archive", e); | ||
| } | ||
| } | ||
|
|
||
| private ArchiverCustomizer getS2ICustomizer(ImageConfiguration imageConfiguration) throws Fabric8ServiceException { | ||
| try { | ||
| if (imageConfiguration.getBuildConfiguration() != null && imageConfiguration.getBuildConfiguration().getEnv() != null) { | ||
| String fileName = IoUtil.sanitizeFileName("s2i-env-" + imageConfiguration.getName()); | ||
| final File environmentFile = new File(config.getBuildDirectory(), fileName); | ||
|
|
||
| try (PrintWriter out = new PrintWriter(new FileWriter(environmentFile))) { | ||
| for (Map.Entry<String, String> e : imageConfiguration.getBuildConfiguration().getEnv().entrySet()) { | ||
| out.println(e.getKey() + "=" + e.getValue()); | ||
| } | ||
| } | ||
|
|
||
| return new ArchiverCustomizer() { | ||
| @Override | ||
| public TarArchiver customize(TarArchiver tarArchiver) throws IOException { | ||
| tarArchiver.addFile(environmentFile, ".s2i/environment"); | ||
| return tarArchiver; | ||
| } | ||
| }; | ||
| } else { | ||
| return null; | ||
| } | ||
| } catch (IOException e) { | ||
| throw new Fabric8ServiceException("Unable to add environment variables to the S2I build archive", e); | ||
| } | ||
| } | ||
|
|
||
| public File getBinaryInputTar() { | ||
| return binaryInputTar; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
core/src/main/java/io/fabric8/maven/core/service/WarBinaryInputArchiveBuilder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| * Copyright 2016 Red Hat, Inc. | ||
| * | ||
| * Red Hat licenses this file to you under the Apache License, version | ||
| * 2.0 (the "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or | ||
| * implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package io.fabric8.maven.core.service; | ||
|
|
||
| import io.fabric8.maven.core.util.ResourceUtil; | ||
| import io.fabric8.maven.docker.config.ImageConfiguration; | ||
| import io.fabric8.maven.docker.service.ServiceHub; | ||
| import org.apache.maven.plugin.MojoExecutionException; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Paths; | ||
| import java.nio.file.StandardCopyOption; | ||
|
|
||
| public class WarBinaryInputArchiveBuilder implements BinaryInputArchiveBuilder { | ||
| private BuildService.BuildServiceConfig config; | ||
| private File binaryInputTar = null; | ||
|
|
||
| public WarBinaryInputArchiveBuilder(BuildService.BuildServiceConfig config) { | ||
| this.config = config; | ||
| } | ||
|
|
||
| @Override | ||
| public void createBinaryInput(ServiceHub hub, File binaryInputDirectory, ImageConfiguration imageConfiguration) throws Fabric8ServiceException { | ||
| try { | ||
| File targetDirectory = new File(config.getBuildDirectory()); | ||
| String[] jarOrWars = ResourceUtil.getFileListOfExtension(targetDirectory, ".war"); | ||
|
|
||
| if(jarOrWars == null || jarOrWars.length == 0) { | ||
| throw new MojoExecutionException("No war/jar built yet. Please ensure that the 'package' phase has run"); | ||
| } | ||
|
|
||
| File warFileLocation = ResourceUtil.getArchiveFile(targetDirectory, jarOrWars); | ||
| File targetWarFileLocation = new File(binaryInputDirectory, warFileLocation.getName()); | ||
| targetWarFileLocation.createNewFile(); | ||
| Files.copy(Paths.get(warFileLocation.getAbsolutePath()), Paths.get(targetWarFileLocation.getAbsolutePath()), StandardCopyOption.REPLACE_EXISTING); | ||
| } catch(IOException exception) { | ||
| throw new Fabric8ServiceException("Cannot examine "+ binaryInputDirectory.getName() + " for the manifest"); | ||
| } catch (MojoExecutionException mojoException) { | ||
| throw new Fabric8ServiceException(mojoException); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public File getBinaryInputTar() { return binaryInputTar; } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.