Skip to content

Commit 6681d91

Browse files
committed
DB2 update and standalone compare infrastructure
Fix #214 Fix #213 Fix #212
1 parent 6f90b0d commit 6681d91

File tree

146 files changed

+8620
-2690
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+8620
-2690
lines changed

.dockerignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
*
2+
!bin/*.sh
3+
!src/install
4+
!src/node
5+
src/html
6+
src/js
7+
src/qa
8+
src/node/gui
9+
!src/package.json

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:17.1.0
1+
FROM node:latest
22
WORKDIR /usr/src/YADAMU
33
ADD https://download.oracle.com/otn_software/linux/instantclient/213000/oracle-instantclient-basic-21.3.0.0.0-1.x86_64.rpm .
44
COPY src/package*.json ./

Dockerfile.dockerignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

bin/compare.bat

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@echo off
2+
REM Run from YADAMU_HOME
3+
set YADAMU_HOME=%CD%
4+
node %YADAMU_HOME%\src\node\cli\compare.js %*

bin/compare.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Run from YADAMU_HOME
2+
export YADAMU_HOME="${YADAMU_HOME:=`pwd`}"
3+
if [ -z ${NODE_NO_WARNINGS+x} ]; then export NODE_NO_WARNINGS=1; fi
4+
node $YADAMU_HOME/src/node/cli/compare.js "$@"

docker/dockerfiles/linux/Dockerfile-GIT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:17.1.0
1+
FROM node:latest
22
WORKDIR /usr/src/YADAMU
33
ADD https://download.oracle.com/otn_software/linux/instantclient/213000/oracle-instantclient-basic-21.3.0.0.0-1.x86_64.rpm .
44
COPY src/package*.json ./
Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
*
2-
!bin
3-
!src
2+
!bin/*.sh
3+
!src/install
4+
!src/node
5+
src/html
6+
src/js
7+
src/qa
8+
src/node/gui
9+
!src/package.json

docker/dockerfiles/linux/yadamu.dockerignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
!bin/*.sh
33
!src/install
44
!src/node
5-
/src/node/gui
6-
/src/node/server
5+
src/node/gui
6+
src/node/server

docker/rdbms/teradata/docker/linux/17/Dockerfile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
FROM ubuntu:20.04
22
RUN apt-get update \
3-
&& apt-get -y install wget gnupg2 software-properties-common net-tools iputils-ping ssh sshpass \
4-
&& \
5-
wget -q https://www.virtualbox.org/download/oracle_vbox_2016.asc -O- | apt-key add - && \
6-
wget -q https://www.virtualbox.org/download/oracle_vbox.asc -O- | apt-key add - && \
7-
add-apt-repository "deb https://download.virtualbox.org/virtualbox/debian focal contrib"
8-
RUN apt-get -y install virtualbox-6.1
3+
&& apt-get -y install wget gnupg2 software-properties-common net-tools iputils-ping ssh sshpass
4+
# && wget -q https://www.virtualbox.org/download/oracle_vbox_2016.asc -O- | apt-key add - \
5+
# && wget -q https://www.virtualbox.org/download/oracle_vbox.asc -O- | apt-key add - \
6+
# && add-apt-repository "deb https://download.virtualbox.org/virtualbox/debian focal contrib"
7+
#RUN apt-get -y install virtualbox-6.1
98
WORKDIR /root
9+
RUN wget https://download.virtualbox.org/virtualbox/6.1.34/virtualbox-6.1_6.1.34-150636~Ubuntu~eoan_amd64.deb -O virtualbox-6.1_6.1.34-150636~Ubuntu~eoan_amd64.deb \
10+
&& wget https://download.virtualbox.org/virtualbox/6.1.34/Oracle_VM_VirtualBox_Extension_Pack-6.1.34.vbox-extpack -O Oracle_VM_VirtualBox_Extension_Pack-6.1.34.vbox-extpack \
11+
&& apt -y install ./virtualbox-6.1_6.1.34-150636~Ubuntu~eoan_amd64.deb
1012
COPY Teradata_Database_17.10.02.01_SLES12_SP3_on_VMware_20210603130901.ova .
11-
COPY Oracle_VM_VirtualBox_Extension_Pack-6.1.32.vbox-extpack .
13+
# COPY Oracle_VM_VirtualBox_Extension_Pack-6.1.34.vbox-extpack .
1214
COPY createTDVM.sh .
1315
copy exec_tdvm_init.sh .
1416
#CMD virtualbox

docker/rdbms/teradata/docker/linux/17/createTDVM.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VBoxManage extpack install Oracle_VM_VirtualBox_Extension_Pack-6.1.32.vbox-extpack <<EOF
1+
VBoxManage extpack install Oracle_VM_VirtualBox_Extension_Pack-6.1.34.vbox-extpack <<EOF
22
Y
33
EOF
44
#VBoxManage natnetwork stop --netname cfgnet

0 commit comments

Comments
 (0)