Commit 3414f33d authored by Diana Stanley's avatar Diana Stanley Committed by Bob Van Landuyt

Update templates and licenses for 11.3

parent bea943ae
FROM node:8.11-alpine FROM node:10.6-alpine
WORKDIR /usr/src/app # Uncomment if use of `process.dlopen` is necessary
# apk add --no-cache libc6-compat
ENV PORT 8080
EXPOSE 8080 # replace this with your application's default port, if necessary
ARG NODE_ENV ARG NODE_ENV=production
ENV NODE_ENV $NODE_ENV ENV NODE_ENV $NODE_ENV
COPY package.json /usr/src/app/ WORKDIR /usr/src/app
COPY package.json .
RUN npm install RUN npm install
COPY . .
COPY . /usr/src/app
# replace this with your application's default port
EXPOSE 8888
CMD [ "npm", "start" ] CMD [ "npm", "start" ]
FROM openjdk:9 FROM maven:3.5-jdk-11 as BUILD
COPY . /usr/src/myapp COPY . /usr/src/app
WORKDIR /usr/src/myapp RUN mvn --batch-mode -f /usr/src/app/pom.xml clean package
RUN javac Main.java FROM openjdk:11-jdk
ENV PORT 4567
EXPOSE 4567
COPY --from=BUILD /usr/src/app/target /opt/target
WORKDIR /opt/target
CMD ["java", "Main"] CMD ["/bin/bash", "-c", "find -type f -name '*-with-dependencies.jar' | xargs java -jar"]
...@@ -7,21 +7,21 @@ RUN apk --no-cache add nodejs postgresql-client tzdata ...@@ -7,21 +7,21 @@ RUN apk --no-cache add nodejs postgresql-client tzdata
# throw errors if Gemfile has been modified since Gemfile.lock # throw errors if Gemfile has been modified since Gemfile.lock
RUN bundle config --global frozen 1 RUN bundle config --global frozen 1
RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app WORKDIR /usr/src/app
COPY Gemfile Gemfile.lock /usr/src/app/ COPY Gemfile Gemfile.lock .
# Install build dependencies - required for gems with native dependencies # Install build dependencies - required for gems with native dependencies
RUN apk add --no-cache --virtual build-deps build-base postgresql-dev && \ RUN apk add --no-cache --virtual build-deps build-base postgresql-dev && \
bundle install && \ bundle install && \
apk del build-deps apk del build-deps
COPY . /usr/src/app COPY . .
# For Sinatra # For Sinatra
#EXPOSE 4567 #EXPOSE 4567
#CMD ["ruby", "./config.rb"] #CMD ["ruby", "./config.rb"]
# For Rails # For Rails
ENV PORT 3000
EXPOSE 3000 EXPOSE 3000
CMD ["bundle", "exec", "rails", "server"] CMD ["bundle", "exec", "rails", "server"]
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
.idea/**/dictionaries .idea/**/dictionaries
.idea/**/shelf .idea/**/shelf
# Generated files
.idea/**/contentModel.xml
# Sensitive or high-churn files # Sensitive or high-churn files
.idea/**/dataSources/ .idea/**/dataSources/
.idea/**/dataSources.ids .idea/**/dataSources.ids
......
...@@ -3,6 +3,9 @@ ...@@ -3,6 +3,9 @@
# Word temporary # Word temporary
~$*.doc* ~$*.doc*
# Word Auto Backup File
Backup of *.doc*
# Excel temporary # Excel temporary
~$*.xls* ~$*.xls*
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
*~ *~
_autosave-* _autosave-*
*.tmp *.tmp
*-cache.lib
*-rescue.lib *-rescue.lib
*-save.pro *-save.pro
*-save.kicad_pcb *-save.kicad_pcb
......
.DS_Store .DS_Store
applet applet
application.linux-arm64
application.linux-armv6hf
application.linux32 application.linux32
application.linux64 application.linux64
application.windows32 application.windows32
......
...@@ -38,6 +38,7 @@ pip-delete-this-directory.txt ...@@ -38,6 +38,7 @@ pip-delete-this-directory.txt
# Unit test / coverage reports # Unit test / coverage reports
htmlcov/ htmlcov/
.tox/ .tox/
.nox/
.coverage .coverage
.coverage.* .coverage.*
.cache .cache
...@@ -72,6 +73,10 @@ target/ ...@@ -72,6 +73,10 @@ target/
# Jupyter Notebook # Jupyter Notebook
.ipynb_checkpoints .ipynb_checkpoints
# IPython
profile_default/
ipython_config.py
# pyenv # pyenv
.python-version .python-version
...@@ -102,3 +107,5 @@ venv.bak/ ...@@ -102,3 +107,5 @@ venv.bak/
# mypy # mypy
.mypy_cache/ .mypy_cache/
.dmypy.json
dmypy.json
...@@ -47,3 +47,15 @@ bower.json ...@@ -47,3 +47,15 @@ bower.json
# Ignore node_modules # Ignore node_modules
node_modules/ node_modules/
# Ignore precompiled javascript packs
/public/packs
/public/packs-test
# Ignore yarn files
/yarn-error.log
yarn-debug.log*
.yarn-integrity
# Ignore uploaded files in development
/storage/*
!/storage/.keep
\ No newline at end of file
...@@ -69,3 +69,10 @@ fastlane/report.xml ...@@ -69,3 +69,10 @@ fastlane/report.xml
fastlane/Preview.html fastlane/Preview.html
fastlane/screenshots/**/*.png fastlane/screenshots/**/*.png
fastlane/test_output fastlane/test_output
# Code Injection
#
# After new code Injection tools there's a generated folder /iOSInjectionProject
# https://github.com/johnno1962/injectionforxcode
iOSInjectionProject/
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
!var/logs/.gitkeep !var/logs/.gitkeep
!var/sessions/.gitkeep !var/sessions/.gitkeep
# Logs (Symfony4)
/var/log/*
!var/log/.gitkeep
# Parameters # Parameters
/app/config/parameters.yml /app/config/parameters.yml
/app/config/parameters.ini /app/config/parameters.ini
......
...@@ -188,6 +188,9 @@ sympy-plots-for-*.tex/ ...@@ -188,6 +188,9 @@ sympy-plots-for-*.tex/
*.pytxcode *.pytxcode
pythontex-files-*/ pythontex-files-*/
# tcolorbox
*.listing
# thmtools # thmtools
*.loe *.loe
......
...@@ -13,3 +13,14 @@ crash.log ...@@ -13,3 +13,14 @@ crash.log
# version control. # version control.
# #
# example.tfvars # example.tfvars
# Ignore override files as they are usually used to override resources locally and so
# are not checked in
override.tf
override.tf.json
*_override.tf
*_override.tf.json
# Include override files you do wish to add to version control using negated pattern
#
# !example_override.tf
...@@ -51,6 +51,8 @@ variables: ...@@ -51,6 +51,8 @@ variables:
KUBERNETES_VERSION: 1.8.6 KUBERNETES_VERSION: 1.8.6
HELM_VERSION: 2.6.1 HELM_VERSION: 2.6.1
DOCKER_DRIVER: overlay2
stages: stages:
- build - build
- test - test
...@@ -67,8 +69,6 @@ build: ...@@ -67,8 +69,6 @@ build:
image: docker:stable-git image: docker:stable-git
services: services:
- docker:stable-dind - docker:stable-dind
variables:
DOCKER_DRIVER: overlay2
script: script:
- setup_docker - setup_docker
- build - build
...@@ -95,8 +95,6 @@ test: ...@@ -95,8 +95,6 @@ test:
code_quality: code_quality:
stage: test stage: test
image: docker:stable image: docker:stable
variables:
DOCKER_DRIVER: overlay2
allow_failure: true allow_failure: true
services: services:
- docker:stable-dind - docker:stable-dind
...@@ -114,8 +112,6 @@ code_quality: ...@@ -114,8 +112,6 @@ code_quality:
license_management: license_management:
stage: test stage: test
image: docker:stable image: docker:stable
variables:
DOCKER_DRIVER: overlay2
allow_failure: true allow_failure: true
services: services:
- docker:stable-dind - docker:stable-dind
...@@ -133,8 +129,6 @@ license_management: ...@@ -133,8 +129,6 @@ license_management:
performance: performance:
stage: performance stage: performance
image: docker:stable image: docker:stable
variables:
DOCKER_DRIVER: overlay2
allow_failure: true allow_failure: true
services: services:
- docker:stable-dind - docker:stable-dind
...@@ -156,8 +150,6 @@ performance: ...@@ -156,8 +150,6 @@ performance:
sast: sast:
stage: test stage: test
image: docker:stable image: docker:stable
variables:
DOCKER_DRIVER: overlay2
allow_failure: true allow_failure: true
services: services:
- docker:stable-dind - docker:stable-dind
...@@ -175,8 +167,6 @@ sast: ...@@ -175,8 +167,6 @@ sast:
dependency_scanning: dependency_scanning:
stage: test stage: test
image: docker:stable image: docker:stable
variables:
DOCKER_DRIVER: overlay2
allow_failure: true allow_failure: true
services: services:
- docker:stable-dind - docker:stable-dind
...@@ -194,8 +184,6 @@ dependency_scanning: ...@@ -194,8 +184,6 @@ dependency_scanning:
container_scanning: container_scanning:
stage: test stage: test
image: docker:stable image: docker:stable
variables:
DOCKER_DRIVER: overlay2
allow_failure: true allow_failure: true
services: services:
- docker:stable-dind - docker:stable-dind
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
variables: variables:
# This will supress any download for dependencies and plugins or upload messages which would clutter the console log. # This will supress any download for dependencies and plugins or upload messages which would clutter the console log.
# `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work. # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true" MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
# As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
# when running from the command line. # when running from the command line.
# `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins. # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins.
......
# Full project: https://gitlab.com/pages/middleman # Full project: https://gitlab.com/pages/middleman
image: ruby:2.4 image: ruby:2.3
variables:
LANG: "C.UTF-8"
cache: cache:
paths: paths:
- vendor - vendor
before_script: test:
script:
- apt-get update -yqqq - apt-get update -yqqq
- apt-get install -y nodejs - apt-get install -y nodejs
- bundle install --path vendor - bundle install --path vendor
test:
script:
- bundle exec middleman build - bundle exec middleman build
except: except:
- master - master
pages: pages:
script: script:
- apt-get update -yqqq
- apt-get install -y nodejs
- bundle install --path vendor
- bundle exec middleman build - bundle exec middleman build
artifacts: artifacts:
paths: paths:
......
# Lifted from: https://about.gitlab.com/2016/03/10/setting-up-gitlab-ci-for-ios-projects/ # Lifted from: https://about.gitlab.com/2016/03/10/setting-up-gitlab-ci-for-ios-projects/
# This file assumes an own GitLab CI runner, setup on an macOS system. # This file assumes an own GitLab CI runner, setup on a macOS system.
stages: stages:
- build - build
- archive - archive
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment