Skip to content

Commit 392fc28

Browse files
authored
Merge pull request #698 from MetaCell/release/2.1.0
Release/2.1.0
2 parents 3692dd7 + 96019e1 commit 392fc28

260 files changed

Lines changed: 20248 additions & 10642 deletions

File tree

Some content is hidden

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

.dockerignore

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,18 @@ docs
55
/infrastructure
66
/blueprint
77
test
8+
/tools/deployment-cli-tools
89
.github
910
.git
1011
.vscode
1112
/deployment
12-
skaffold.yaml
13+
skaffold.yaml
14+
*.egg-info
15+
__pycache__
16+
.hypothesis
17+
.coverage
18+
.pytest_cache
19+
/application-templates
20+
/deployment-configuration
21+
/cloud-harness
22+
.openapi-generator

.github/workflows/trivy-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ jobs:
2323
contents: read # for actions/checkout to fetch code
2424
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
2525
name: Build
26-
runs-on: "ubuntu-18.04"
26+
runs-on: "ubuntu-20.04"
2727
steps:
2828
- name: Checkout code
29-
uses: actions/checkout@v2
29+
uses: actions/checkout@v3
3030

3131
- name: Build an image from Dockerfile
3232
run: |
33-
docker build -t cloudharness-base:${{ github.sha }} . -f ./infrastructure/base-images/cloudharness-base/Dockerfile
33+
DOCKER_BUILDKIT=1 docker build -t cloudharness-base:${{ github.sha }} . -f ./infrastructure/base-images/cloudharness-base/Dockerfile
3434
3535
- name: Run Trivy vulnerability scanner
3636
uses: aquasecurity/trivy-action@2a2157eb22c08c9a1fac99263430307b8d1bc7a2

.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ skaffold.yaml
1414
.tox
1515
.pytest_cache
1616
.overrides
17-
deployment.yaml
17+
/deployment.yaml
1818
.hypothesis
19-
__pycache__
19+
__pycache__
20+
.env

application-templates/django-app/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ WORKDIR ${APP_DIR}
2121
RUN mkdir -p ${APP_DIR}/static/www
2222

2323
COPY backend/requirements.txt ${APP_DIR}
24-
RUN pip3 install --no-cache-dir -r requirements.txt
24+
RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip &&\
25+
pip3 install --no-cache-dir -r requirements.txt --prefer-binary
2526

2627
COPY backend/requirements.txt backend/setup.py ${APP_DIR}
2728
RUN python3 -m pip install -e .

application-templates/flask-server/backend/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ ENV PORT=8080
88

99
COPY requirements.txt /usr/src/app/
1010

11-
RUN pip3 install --no-cache-dir -r requirements.txt
11+
RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip &&\
12+
pip3 install --no-cache-dir -r requirements.txt
1213

1314
COPY . /usr/src/app
1415

0 commit comments

Comments
 (0)