Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:22.04
FROM ubuntu:22.04 as deps

ARG TARGETARCH

Expand All @@ -24,7 +24,7 @@ RUN wget https://go.dev/dl/go1.23.0.linux-amd64.tar.gz \
&& tar -C /usr/local -xzf go1.23.0.linux-amd64.tar.gz \
&& rm go1.23.0.linux-amd64.tar.gz

# Install Thrift 0.23
# Install Thrift 0.22
RUN wget https://dlcdn.apache.org/thrift/0.22.0/thrift-0.22.0.tar.gz \
&& tar -xzf thrift-0.22.0.tar.gz \
&& cd thrift-0.22.0 \
Expand All @@ -45,3 +45,26 @@ ENV MAVEN_HOME=/opt/maven
ENV GOROOT=/usr/local/go
ENV GOPATH=/home/developer/go
ENV PATH=$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin:$GOROOT/bin:$GOPATH/bin

EXPOSE 7878 8000 17000 8050 8930 8960 8962 8970 18800 19900 18889 19908

FROM deps AS compiler

COPY --chown=developer:developer .. /home/developer/workspace
WORKDIR /home/developer/workspace
RUN mvn clean install -DskipTests


FROM eclipse-temurin:17-jdk AS runner
WORKDIR /app

COPY --from=compiler /home/developer/workspace/distribution/*.tar.gz ./

COPY ../dev-tools/deployment-scripts/*.sh ./
COPY ../vault ./vault

RUN chmod +x ./distribution_update.sh ./services_up.sh

EXPOSE 7878 8000 17000 8050 8930 8960 8962 8970 18800 19900 18889 19908

CMD ["sh", "-c", "./distribution_update.sh && ./services_up.sh && sleep infinity"]
3 changes: 3 additions & 0 deletions .devcontainer/database_scripts/init/00-accounts.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CREATE USER IF NOT EXISTS 'airavata'@'%' IDENTIFIED BY '123456';
GRANT ALL PRIVILEGES ON *.* TO 'airavata'@'%';
FLUSH PRIVILEGES;
8 changes: 8 additions & 0 deletions .devcontainer/database_scripts/init/01-databases.sql
Original file line number Diff line number Diff line change
Expand Up @@ -3519,6 +3519,14 @@ CREATE DATABASE /*!32312 IF NOT EXISTS*/ `workflow_catalog` /*!40100 DEFAULT CHA

USE `workflow_catalog`;

--
-- Current Database: `research_catalog`
--

CREATE DATABASE /*!32312 IF NOT EXISTS*/ `research_catalog` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */;

USE `research_catalog`;

--
-- Current Database: `app_catalog`
--
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
USE app_catalog;

-- Add RESOURCE_TYPE column to base table
ALTER TABLE `GROUP_COMPUTE_RESOURCE_PREFERENCE`
ADD COLUMN `RESOURCE_TYPE` VARCHAR(255) NOT NULL DEFAULT 'SLURM';
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"dockerComposeFile": "docker-compose.yml",
"service": "devcontainer",
"features": {},
"workspaceFolder": "/workspace",
"workspaceFolder": "/home/developer/workspace",
"forwardPorts": [],
"customizations": {
"vscode": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ services:
links:
- "keycloak:airavata.host"
ports:
- "9930:9930"
- "8930:8930"
- "7878:7878"
- "8962:8962"
- "8960:8960"
Expand Down Expand Up @@ -121,7 +121,7 @@ services:
- job.notification.enable=true
- job.notification.emailids=
- job.notification.flags=abe
- credential.store.keystore.url=/opt/keystores/airavata.jks
- credential.store.keystore.url=/opt/keystores/airavata.p12
- credential.store.keystore.alias=airavata
- credential.store.keystore.password=airavata
- credential.store.jdbc.url=jdbc:mariadb://db:3306/credential_store
Expand Down Expand Up @@ -154,9 +154,9 @@ services:
- TLS.enabled=true
- TLS.api.server.port=9930
- TLS.client.timeout=10000
- keystore.path=/opt/keystores/airavata.jks
- keystore.path=/opt/keystores/airavata.p12
- keystore.password=airavata
- trust.store=/opt/keystores/airavata.jks
- trust.store=/opt/keystores/airavata.p12
- trust.store.password=airavata
- authz.cache.enabled=true
- authz.cache.manager.class=org.apache.airavata.service.security.authzcache.DefaultAuthzCacheManager
Expand Down
Loading