Skip to content

Commit

Permalink
General Availability Release codebase
Browse files Browse the repository at this point in the history
  • Loading branch information
Michele Pegoraro committed Mar 19, 2020
1 parent 96bf2b9 commit 04fe1c0
Show file tree
Hide file tree
Showing 185 changed files with 26,705 additions and 1,793 deletions.
1 change: 1 addition & 0 deletions .env.development
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SITE_PREFIX="/wh-curamspm-devops/vnext-assets/"
1 change: 1 addition & 0 deletions .env.local
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SITE_PREFIX="/"
1 change: 1 addition & 0 deletions .env.production
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SITE_PREFIX="/spm-kubernetes/"
1 change: 1 addition & 0 deletions .env.staging
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SITE_PREFIX="/wh-curamspm-devops/spm-kubernetes/"
72 changes: 69 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
_book
node_modules
*.html

*.lock
Expand All @@ -20,8 +19,75 @@ staticcontent
*.zip
*.swp
StaticContent.zip
*.DS_Store
.classpath
.project
.settings
*.drawio
*.drawio

#GATSBY
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage
# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/
# Typescript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# dotenv environment variables file
.env

# gatsby files
.cache/
public
# Mac files
.DS_Store

# Yarn
yarn-error.log
.pnp/
.pnp.js
# Yarn Integrity file
.yarn-integrity
1 change: 1 addition & 0 deletions .markdownlint.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"MD007": { "indent": 2 },
"MD010": false,
"MD013": { "line_length": 240 },
"MD026": false,
"MD033": false,
"MD040": false,
"no-trailing-spaces": true
Expand Down
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
language: node_js
node_js:
- "8"
- "12"

group: bluezone
dist: xenial

install:
- npm install -g gitbook-cli markdownlint-cli
- gitbook install
- npm install -g gatsby markdownlint-cli
- npm install

script:
- markdownlint docs
- gitbook build
- markdownlint **/*.mdx --ignore src/pages/index.mdx
- gatsby build --prefix-paths

deploy:
- provider: pages
skip_cleanup: true
local_dir: _book
local_dir: public
github_token: $GITHUB_TOKEN
github_url: github.com
github_url: github.ibm.com
committer_from_gh: true
target_branch: gh-pages
on:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

This repository contains the assets and the runbook to follow to containerized SPM.

The runbook is available at this URL: https://ibm.github.io/spm-containerization/
The runbook is available at this URL: https://ibm.github.io/spm-kubernetes/
5 changes: 0 additions & 5 deletions book.json

This file was deleted.

43 changes: 43 additions & 0 deletions dockerfiles/HTTPServer/CE.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
###############################################################################
# Copyright 2019,2020 IBM Corporation
#
# Licensed 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.
###############################################################################

ARG HTTP_VERSION=9.0.0.11

#Final
FROM ibmcom/ibm-http-server:${HTTP_VERSION}
ARG HTTP_VERSION
LABEL IHS_VERSION=${HTTP_VERSION}

CMD ["/work/ihsstart.sh"]

RUN useradd -g 0 -M default && usermod -L default \
&& echo "include conf.d/*.conf" >> /opt/IBM/HTTPServer/conf/httpd.conf \
&& sed -i 's/^Listen 80$/Listen 8080/' /opt/IBM/HTTPServer/conf/httpd.conf \
&& chmod g+w /opt/IBM/HTTPServer \
&& chmod -Rc g+w /opt/IBM/HTTPServer/logs

#Note label must match the SSLServerCert setting located within custom_ssl.conf file
#The certificate label name, when viewed in the Key Management Utility (iKeyman), should not contain reserved characters such as "; ; - _" ( semicolon, colon, dash, and so on). These are reserved characters and should not be used as part of the label name.
RUN gskcapicmd -keydb -create -db "/opt/IBM/WebSphere/Plugins/config/key.kdb" -pw wasadmin -type cms -stash \
&& gskcapicmd -cert -create -db "/opt/IBM/WebSphere/Plugins/config/key.kdb" -pw wasadmin -label websphere -size 2048 -sigalg SHA256WithRSA -expire 3650 -dn "CN=websphere,O=IBM,C=IE" -default_cert yes \
&& chmod -Rc g+rw /opt/IBM/WebSphere/Plugins/config \
&& chmod -Rc g+rw /opt/IBM/WebSphere/Plugins/logs

COPY build /opt/IBM/HTTPServer/htdocs/universal
COPY httpdconfig/custom_*.conf /opt/IBM/HTTPServer/conf.d/
COPY ihsstart.sh /work/

USER default
26 changes: 0 additions & 26 deletions dockerfiles/HTTPServer/Dockerfile

This file was deleted.

49 changes: 49 additions & 0 deletions dockerfiles/HTTPServer/StaticContent.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
###############################################################################
# Copyright 2019,2020 IBM Corporation
#
# Licensed 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.
###############################################################################

ARG HTTP_VERSION=9.0.0.11

#Unzip static content in to temp
FROM alpine AS ExplodedStaticzip
COPY StaticContent.zip /tmp/
RUN mkdir -p /work/staticcontent/ \
&& unzip -o -q /tmp/StaticContent.zip -d /work/staticcontent/

#Final
FROM ibmcom/ibm-http-server:${HTTP_VERSION}
ARG HTTP_VERSION
LABEL IHS_VERSION=${HTTP_VERSION}

CMD ["/work/ihsstart.sh"]

RUN useradd -g 0 -M default && usermod -L default \
&& echo "include conf.d/*.conf" >> /opt/IBM/HTTPServer/conf/httpd.conf \
&& sed -i 's/^Listen 80$/Listen 8080/' /opt/IBM/HTTPServer/conf/httpd.conf \
&& chmod g+w /opt/IBM/HTTPServer \
&& chmod -Rc g+w /opt/IBM/HTTPServer/logs

#Note label must match the SSLServerCert setting located within custom_ssl.conf file
#The certificate label name, when viewed in the Key Management Utility (iKeyman), should not contain reserved characters such as "; ; - _" ( semicolon, colon, dash, and so on). These are reserved characters and should not be used as part of the label name.
RUN gskcapicmd -keydb -create -db "/opt/IBM/WebSphere/Plugins/config/key.kdb" -pw wasadmin -type cms -stash \
&& gskcapicmd -cert -create -db "/opt/IBM/WebSphere/Plugins/config/key.kdb" -pw wasadmin -label websphere -size 2048 -sigalg SHA256WithRSA -expire 3650 -dn "CN=websphere,O=IBM,C=IE" -default_cert yes \
&& chmod -Rc g+rw /opt/IBM/WebSphere/Plugins/config \
&& chmod -Rc g+rw /opt/IBM/WebSphere/Plugins/logs

COPY --from=ExplodedStaticzip /work/staticcontent/WebContent /opt/IBM/HTTPServer/htdocs/CuramStatic
COPY httpdconfig/custom_*.conf /opt/IBM/HTTPServer/conf.d/
COPY ihsstart.sh /work/

USER default
18 changes: 0 additions & 18 deletions dockerfiles/HTTPServer/configure_admin.sh

This file was deleted.

8 changes: 3 additions & 5 deletions dockerfiles/HTTPServer/httpdconfig/custom_ssl.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@

<IfModule !mod_ibm_ssl.c>
LoadModule ibm_ssl_module modules/mod_ibm_ssl.so
# Below 2 Listen directives needed for IHS in WINDOWS, second one for IPv6 support
Listen 0.0.0.0:443
Listen [::]:443
<VirtualHost *:443>
Listen 0.0.0.0:8443
<VirtualHost *:8443>
SSLEnable
SSLClientAuth None
SSLServerCert websphere
SSLServerCert websphere
# Disable SSLv3 for CVE-2014-3566
# SSLv2 is disabled in V8R0 and later by default, and in typical V7
# and earlier configurations disabled implicitly when SSLv3 ciphers
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Alias /CuramStatic/ "/opt/IBM/HTTPServer/htdocs/WebContent/"
<Directory "/opt/IBM/HTTPServer/htdocs/CuramStatic/">
Options Indexes MultiViews
Options MultiViews
AllowOverride None
#Order allow,deny
Require all granted
Expand Down
25 changes: 0 additions & 25 deletions dockerfiles/HTTPServer/ihs_responsefile.txt

This file was deleted.

Loading

0 comments on commit 04fe1c0

Please sign in to comment.