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.

Sign up for GitHub

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

Jump to bottom

[BEAM-9084] cleaning up docker image tag #10557

Merged
merged 3 commits into from Jan 15, 2020
Merged

[BEAM-9084] cleaning up docker image tag #10557

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2babd75
[BEAM-9084] cleaning up docker image tag
Hannah-Jiang Jan 11, 2020
99dd538
[BEAM-9084] fix Java spotless
Hannah-Jiang Jan 13, 2020
9d8bfeb
Merge branch 'master' into cleaning_up_docker_tags
Hannah-Jiang Jan 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Expand Up @@ -24,6 +24,6 @@ signing.gnupg.executable=gpg
signing.gnupg.useLegacyGpg=true

version=2.19.0-SNAPSHOT
python_sdk_version=2.19.0.dev
sdk_version=2.19.0.dev

javaVersion=1.8
4 changes: 2 additions & 2 deletions release/src/main/scripts/set_version.sh
View file
Open in desktop
Expand Up @@ -67,7 +67,7 @@ if [[ -z "$IS_SNAPSHOT_VERSION" ]] ; then
sed -i -e "s/version=.*/version=$TARGET_VERSION/" gradle.properties
sed -i -e "s/project.version = .*/project.version = '$TARGET_VERSION'/" buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
sed -i -e "s/^__version__ = .*/__version__ = '${TARGET_VERSION}'/" sdks/python/apache_beam/version.py
sed -i -e "s/python_sdk_version=.*/python_sdk_version=$TARGET_VERSION/" gradle.properties
sed -i -e "s/sdk_version=.*/sdk_version=$TARGET_VERSION/" gradle.properties
# TODO: [BEAM-4767]
sed -i -e "s/'dataflow.container_version' : .*/'dataflow.container_version' : 'beam-${RELEASE}'/" runners/google-cloud-dataflow-java/build.gradle
else
Expand All @@ -79,7 +79,7 @@ else
sed -i -e "s/version=.*/version=$TARGET_VERSION-SNAPSHOT/" gradle.properties
sed -i -e "s/project.version = .*/project.version = '$TARGET_VERSION'/" buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
sed -i -e "s/^__version__ = .*/__version__ = '${TARGET_VERSION}.dev'/" sdks/python/apache_beam/version.py
sed -i -e "s/python_sdk_version=.*/python_sdk_version=$TARGET_VERSION.dev/" gradle.properties
sed -i -e "s/sdk_version=.*/sdk_version=$TARGET_VERSION.dev/" gradle.properties
sed -i -e "s/'dataflow.container_version' : .*/'dataflow.container_version' : 'beam-master-.*'/" runners/google-cloud-dataflow-java/build.gradle
fi

2 changes: 1 addition & 1 deletion ...nstruction-java/src/main/java/org/apache/beam/runners/core/construction/Environments.java
View file
Open in desktop
Expand Up @@ -55,7 +55,7 @@ public class Environments {
* container.
*/
private static final String JAVA_SDK_HARNESS_CONTAINER_URL =
"apachebeam/java_sdk:" + ReleaseInfo.getReleaseInfo().getVersion();
"apachebeam/java_sdk:" + ReleaseInfo.getReleaseInfo().getSdkVersion();
public static final Environment JAVA_SDK_HARNESS_ENVIRONMENT =
createDockerEnvironment(JAVA_SDK_HARNESS_CONTAINER_URL);

Expand Down
2 changes: 1 addition & 1 deletion sdks/java/container/build.gradle
View file
Open in desktop
Expand Up @@ -74,7 +74,7 @@ docker {
root: project.rootProject.hasProperty(["docker-repository-root"]) ?
project.rootProject["docker-repository-root"] : "apachebeam",
tag: project.rootProject.hasProperty(["docker-tag"]) ?
project.rootProject["docker-tag"] : project.version)
project.rootProject["docker-tag"] : project.sdk_version)
dockerfile project.file("./${dockerfileName}")
files "./build/"
}
Expand Down
1 change: 1 addition & 0 deletions sdks/java/core/build.gradle
View file
Open in desktop
Expand Up @@ -46,6 +46,7 @@ artifact includes entire Apache Beam Java SDK."""
processResources {
filter org.apache.tools.ant.filters.ReplaceTokens, tokens: [
'pom.version': version,
'pom.sdk_version': sdk_version,
'timestamp': new Date().format("yyyy-MM-dd HH:mm")
]
}
Expand Down
10 changes: 9 additions & 1 deletion sdks/java/core/src/main/java/org/apache/beam/sdk/util/ReleaseInfo.java
View file
Open in desktop
Expand Up @@ -49,11 +49,16 @@ public String getName() {
return getProperties().get("name");
}

/** Provides the SDK version. */
/** Provides the BEAM version. ie: 2.18.0-SNAPSHOT */
public String getVersion() {
return getProperties().get("version");
}

/** Provides the SDK version. ie: 2.18.0 or 2.18.0.dev */
public String getSdkVersion() {
return getProperties().get("sdk_version");
}

/////////////////////////////////////////////////////////////////////////
private static final Logger LOG = LoggerFactory.getLogger(ReleaseInfo.class);
private static final String DEFAULT_NAME = "Apache Beam SDK for Java";
Expand All @@ -79,6 +84,9 @@ private static class LazyInit {
if (!properties.containsKey("version")) {
properties.setProperty("version", DEFAULT_VERSION);
}
if (!properties.containsKey("sdk_version")) {
properties.setProperty("sdk_version", DEFAULT_VERSION);
}
INSTANCE = new AutoValue_ReleaseInfo(ImmutableMap.copyOf((Map) properties));
}
}
Expand Down
1 change: 1 addition & 0 deletions sdks/java/core/src/main/resources/org/apache/beam/sdk/sdk.properties
View file
Open in desktop
Expand Up @@ -17,6 +17,7 @@
# SDK source version

version=@pom.version@
sdk_version=@pom.sdk_version@

build.date=@timestamp@

2 changes: 1 addition & 1 deletion sdks/python/build.gradle
View file
Open in desktop
Expand Up @@ -48,7 +48,7 @@ task sdist {
args '-c', ". ${envdir}/bin/activate && python setup.py -q sdist --formats zip,gztar --dist-dir ${buildDir}"
}

def collection = fileTree(buildDir){ include "**/*${project['python_sdk_version']}*.tar.gz" exclude 'srcs/**'}
def collection = fileTree(buildDir){ include "**/*${project.sdk_version}*.tar.gz" exclude 'srcs/**'}

// we need a fixed name for the artifact
copy { from collection.singleFile; into buildDir; rename { tarball } }
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/py2/build.gradle
View file
Open in desktop
Expand Up @@ -57,7 +57,7 @@ docker {
root: project.rootProject.hasProperty(["docker-repository-root"]) ?
project.rootProject["docker-repository-root"] : "apachebeam",
tag: project.rootProject.hasProperty(["docker-tag"]) ?
project.rootProject["docker-tag"] : project['python_sdk_version'])
project.rootProject["docker-tag"] : project.sdk_version)
files "../Dockerfile", "./build"
buildArgs(['py_version': "2.7"])
}
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/py35/build.gradle
View file
Open in desktop
Expand Up @@ -57,7 +57,7 @@ docker {
root: project.rootProject.hasProperty(["docker-repository-root"]) ?
project.rootProject["docker-repository-root"] : "apachebeam",
tag: project.rootProject.hasProperty(["docker-tag"]) ?
project.rootProject["docker-tag"] : project['python_sdk_version'])
project.rootProject["docker-tag"] : project.sdk_version)
files "../Dockerfile", "./build"
buildArgs(['py_version': "3.5"])
}
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/py36/build.gradle
View file
Open in desktop
Expand Up @@ -57,7 +57,7 @@ docker {
root: project.rootProject.hasProperty(["docker-repository-root"]) ?
project.rootProject["docker-repository-root"] : "apachebeam",
tag: project.rootProject.hasProperty(["docker-tag"]) ?
project.rootProject["docker-tag"] : project['python_sdk_version'])
project.rootProject["docker-tag"] : project.sdk_version)
files "../Dockerfile", "./build"
buildArgs(['py_version': "3.6"])
}
Expand Down
2 changes: 1 addition & 1 deletion sdks/python/container/py37/build.gradle
View file
Open in desktop
Expand Up @@ -57,7 +57,7 @@ docker {
root: project.rootProject.hasProperty(["docker-repository-root"]) ?
project.rootProject["docker-repository-root"] : "apachebeam",
tag: project.rootProject.hasProperty(["docker-tag"]) ?
project.rootProject["docker-tag"] : project['python_sdk_version'])
project.rootProject["docker-tag"] : project.sdk_version)
files "../Dockerfile", "./build"
buildArgs(['py_version': "3.7"])
}
Expand Down