yetus-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [yetus] branch master updated: YETUS-739. yetus' mvn site fails when run with built-in dockerfile
Date Sun, 23 Dec 2018 17:47:38 GMT
This is an automated email from the ASF dual-hosted git repository.

aw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yetus.git


The following commit(s) were added to refs/heads/master by this push:
     new 2f69401  YETUS-739. yetus' mvn site fails when run with built-in dockerfile
2f69401 is described below

commit 2f694013e2410bafe0c7bd54371d7d20f9b51ad6
Author: Allen Wittenauer <aw@apache.org>
AuthorDate: Sat Dec 15 09:34:05 2018 -0800

    YETUS-739. yetus' mvn site fails when run with built-in dockerfile
    
    Signed-off-by: Allen Wittenauer <aw@apache.org>
---
 Dockerfile                                         |  2 +-
 README.md                                          |  2 +-
 asf-site-src/Dockerfile                            | 25 +++++++++++++++-------
 asf-site-src/pom.xml                               |  2 +-
 asf-site-src/source/contribute/releases.md         |  2 +-
 asf-site-src/source/contribute/website.md          |  4 ++--
 pom.xml                                            | 16 ++++++++------
 .../src/main/shell/test-patch-docker/Dockerfile    |  9 +++++++-
 start-build-env.sh                                 |  4 ++--
 9 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ebc2f5e..0884599 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG DOCKER_TAG=latest
+ARG DOCKER_TAG=master
 ARG DOCKER_REPO=apache/yetus
 FROM ${DOCKER_REPO}-base:${DOCKER_TAG}
 
diff --git a/README.md b/README.md
index a7dde39..789a485 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ mvn clean install -Papache-release -Pgpg2
 mvn clean install -Papache-release -Dgpg.sign=skip
 
 # Build the website (requires a mvn install first)
-mvn site
+mvn site site:stage
 ```
 
 After executing one or more of the Apache Maven commands, artifacts will be in `yetus-dist/target/artifacts`
or ready for a `mvn deploy`.
\ No newline at end of file
diff --git a/asf-site-src/Dockerfile b/asf-site-src/Dockerfile
index 77f34a8..a18877e 100644
--- a/asf-site-src/Dockerfile
+++ b/asf-site-src/Dockerfile
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG DOCKER_TAG=latest
+ARG DOCKER_TAG=master
 FROM apache/yetus-build:${DOCKER_TAG}
 
 WORKDIR /root
@@ -41,6 +41,22 @@ RUN apt-get -q update \
 # we really want gpg2 to be the default gpg implementation
 # it doesn't appear Xenial supports that though
 RUN ln -s /usr/bin/gpg2 /usr/local/bin/gpg
+
+RUN echo "export GPG_TTY=\$(tty)" >>  /root/.bashrc
+RUN groupadd --non-unique -g "${GROUP_ID}" "${USER_NAME}"
+RUN useradd -g "${GROUP_ID}" -u "${USER_ID}" -k /root -m "${USER_NAME}"
+# shellcheck disable=SC2039,SC1117
+RUN echo -e "${USER_NAME}\\tALL=NOPASSWD: ALL" > "/etc/sudoers.d/yetus-build-${USER_ID}"
+ENV HOME /home/${USER_NAME}
+
+WORKDIR /home/${USER_NAME}
+
+USER ${USER_NAME}
+
+RUN bundle config --global github.https true
+RUN bundle config --global path "${BUNDLE_PATH}"
+ENV GEM_HOME ${BUNDLE_PATH}
+
 # pre-install most of the middleman stack to save time
 # on re-launches
 RUN gem install bundler \
@@ -52,10 +68,3 @@ RUN gem install bundler \
     tzinfo-data \
     rake:10.3.1 \
     nokogiri:1.8.5
-RUN bundle config --global github.https true
-RUN echo "export GPG_TTY=\$(tty)" >>  /root/.bashrc
-RUN groupadd --non-unique -g "${GROUP_ID}" "${USER_NAME}"
-RUN useradd -g "${GROUP_ID}" -u "${USER_ID}" -k /root -m "${USER_NAME}"
-# shellcheck disable=SC2039,SC1117
-RUN echo -e "${USER_NAME}\\tALL=NOPASSWD: ALL" > "/etc/sudoers.d/yetus-build-${USER_ID}"
-ENV HOME /home/${USER_NAME}
diff --git a/asf-site-src/pom.xml b/asf-site-src/pom.xml
index 2c0cfef..7f9f566 100644
--- a/asf-site-src/pom.xml
+++ b/asf-site-src/pom.xml
@@ -193,7 +193,7 @@
         <executions>
           <execution>
             <id>website-docs</id>
-            <phase>site</phase>
+            <phase>site:stage</phase>
             <goals>
               <goal>single</goal>
             </goals>
diff --git a/asf-site-src/source/contribute/releases.md b/asf-site-src/source/contribute/releases.md
index 6e802f8..f75bcd3 100644
--- a/asf-site-src/source/contribute/releases.md
+++ b/asf-site-src/source/contribute/releases.md
@@ -200,7 +200,7 @@ Depending on how candidate evaluation goes, you may end up performing
these step
 1. Build release artifacts. You should use our convenience script to create the tarballs
and markdown documents for a release. Run the following from the release staging branch and
inspect the results:
 
         $ mvn --batch-mode clean install -Papache-release
-        $ mvn --batch-mode site
+        $ mvn --batch-mode site site:stage
         $ ls -lah  yetus-dist/target/artifacts/*
 1. Check out the staging area for release candidates and make a directory for this candidate,
somewhere outside of your working directory. Copy the artifacts (**except for the site.tar.gz**)
from the previous step into place. For example, when working on RC1 for the 0.7.0 release
 
diff --git a/asf-site-src/source/contribute/website.md b/asf-site-src/source/contribute/website.md
index 17f0698..c2f24a2 100644
--- a/asf-site-src/source/contribute/website.md
+++ b/asf-site-src/source/contribute/website.md
@@ -59,7 +59,7 @@ To generate the static website for Apache Yetus run the following command
at the
 
 ```bash
 mvn --batch-mode install
-mvn --batch-mode site
+mvn --batch-mode site site:stage
 ```
 
 Apache Yetus uses itself to build parts of its website. ('Flying our own airplanes')  This
command will first generate a full build of Apache Yetus and create a static website in the
`asf-site-src/target/site` sub directory and a tarball of the site in yetus-dist/target/.
You can load it in a web browser, e.g. assuming you are still in the asf-site-src directory
on OS X:
@@ -90,7 +90,7 @@ $ git checkout master
 $ git reset --hard origin/master
 $ git clean -xdf
 $ mvn --batch-mode install
-$ mvn --batch-mode site
+$ mvn --batch-mode site site:stage
 $ rsync --quiet --checksum --inplace --recursive yetus-dist/target/apache-yetus-${project.version}-SNAPSHOT-site/
../../yetus-site/
 $ cd ../../yetus-site
 $ # check the set of differences
diff --git a/pom.xml b/pom.xml
index b8d9058..68e28a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,14 @@
     </mailingList>
   </mailingLists>
 
+  <distributionManagement>
+    <site>
+      <id>Apache Yetus</id>
+      <name>site</name>
+      <url>https://yetus.apache.org/</url>
+    </site>
+  </distributionManagement>
+
   <properties>
     <maven.min.version>3.2.0</maven.min.version>
     <maven.api.version>3.2</maven.api.version>
@@ -280,7 +288,7 @@
               <charset>${maven.compile.encoding}</charset>
               <reportOutputDirectory>${project.build.directory}/site</reportOutputDirectory>
               <destDir>documentation/in-progress/javadocs</destDir>
-              <doclet>org.apache.yetus.audience.tools.IncludePublicAnnotationsStandardDoclet</doclet>
+              <doclet>org.apache.yetus.audience.tools.ExcludePrivateAnnotationsStandardDoclet</doclet>
               <docletArtifacts>
                 <docletArtifact>
                   <groupId>org.apache.yetus</groupId>
@@ -289,13 +297,9 @@
                 </docletArtifact>
               </docletArtifacts>
               <useStandardDocletOptions>true</useStandardDocletOptions>
-
-              <!-- switch on dependency-driven aggregation -->
               <includeDependencySources>false</includeDependencySources>
-
               <dependencySourceIncludes>
-                <!-- include ONLY dependencies I control -->
-                <dependencySourceInclude>org.apache.hadoop:hadoop-annotations</dependencySourceInclude>
+                <dependencySourceInclude>org.apache.yetus:audience-annotations</dependencySourceInclude>
               </dependencySourceIncludes>
 
             </configuration>
diff --git a/precommit/src/main/shell/test-patch-docker/Dockerfile b/precommit/src/main/shell/test-patch-docker/Dockerfile
index 8ad2631..4ba2fcf 100644
--- a/precommit/src/main/shell/test-patch-docker/Dockerfile
+++ b/precommit/src/main/shell/test-patch-docker/Dockerfile
@@ -182,12 +182,19 @@ RUN ln -s /usr/local/bin/pylint2 /usr/local/bin/pylint
 # Install ruby, rubocop, and ruby-lint
 ###
 RUN echo 'gem: --no-rdoc --no-ri' >> /root/.gemrc
-RUN apt-get -q update && apt-get -q install --no-install-recommends -y ruby ruby-dev
\
+RUN apt-get -q update && apt-get -q install --no-install-recommends -y \
+    ruby \
+    ruby-dev \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 RUN gem install rake
 RUN gem install rubocop
 RUN gem install ruby-lint
+RUN gem install bundler
+# set some reasonable defaults for ruby
+# user's can always override these as needed
+ENV PATH ${PATH}:/var/tmp/.bundler-gems/bin
+ENV BUNDLE_PATH /var/tmp/.bundler-gems
 
 ####
 # Install shellcheck (shell script lint)
diff --git a/start-build-env.sh b/start-build-env.sh
index e773e4a..d2d024a 100755
--- a/start-build-env.sh
+++ b/start-build-env.sh
@@ -26,9 +26,9 @@ if [[ "${BRANCH}" =~ HEAD ]]; then
   BRANCH=$(git branch | grep '\*' | awk '{print $NF}'  | sed -e s,rel/,,g -e s,\),,g )
 fi
 
-echo "Attempting a pull of apache/yetus-base:${BRANCH} and apache/yetus-base:latest to save
time"
+echo "Attempting a pull of apache/yetus-base:${BRANCH} and apache/yetus-base:master to save
time"
 echo "Errors here will be ignored!"
-docker pull "apache/yetus-base:${BRANCH}" || docker pull "apache/yetus-base:latest" || true
+docker pull "apache/yetus-base:${BRANCH}" || docker pull "apache/yetus-base:master" || true
 
 docker build -t "apache/yetus-build:${BRANCH}" .
 


Mime
View raw message