Skip to content

Commit

Permalink
Merge pull request #7065 from topcoder-platform/master-revert-2
Browse files Browse the repository at this point in the history
Prod Release 3 - security fixes
  • Loading branch information
kkartunov authored Feb 4, 2025
2 parents 6d7b09e + 3b0139f commit 0601651
Show file tree
Hide file tree
Showing 284 changed files with 378 additions and 34,686 deletions.
56 changes: 27 additions & 29 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ install_deploysuite: &install_deploysuite
cp ./../buildscript/buildenv.sh .
cp ./../buildscript/awsconfiguration.sh .
restore_cache_settings_for_build: &restore_cache_settings_for_build
key: docker-node-modules-v3-{{ checksum "package-lock.json" }}
key: docker-node-modules-v4-{{ checksum "package-lock.json" }}

save_cache_settings: &save_cache_settings
key: docker-node-modules-v3-{{ checksum "package-lock.json" }}
key: docker-node-modules-v4-{{ checksum "package-lock.json" }}
paths:
- node_modules

Expand Down Expand Up @@ -260,37 +260,37 @@ jobs:
# path: ./automated-smoke-test/test-results

# Automated Smoke Testing against Production
Smoke-Testing-On-Production:
<<: *defaults
steps:
# Initialization.
- checkout
- setup_remote_docker
- run: *install_dependency
- run: *install_deploysuite
# Restoration of node_modules from cache.
- restore_cache: *restore_cache_settings_for_build
- run:
name: "configuring environment"
command: |
./awsconfiguration.sh PROD
./buildenv.sh -e PROD -b prod_communityapp_buildvar,prod_communityapp_deployvar
- run:
name: "Run automation"
no_output_timeout: 20m
command: |
source awsenvconf
source buildenvvar
./automated-smoke-test/smoketest.sh automation-config-prod.json prod
- store_artifacts:
path: ./automated-smoke-test/test-results
# Smoke-Testing-On-Production:
# <<: *defaults
# steps:
# # Initialization.
# - checkout
# - setup_remote_docker
# - run: *install_dependency
# - run: *install_deploysuite
# # Restoration of node_modules from cache.
# - restore_cache: *restore_cache_settings_for_build
# - run:
# name: "configuring environment"
# command: |
# ./awsconfiguration.sh PROD
# ./buildenv.sh -e PROD -b prod_communityapp_buildvar,prod_communityapp_deployvar
# - run:
# name: "Run automation"
# no_output_timeout: 20m
# command: |
# source awsenvconf
# source buildenvvar
# ./automated-smoke-test/smoketest.sh automation-config-prod.json prod
# - store_artifacts:
# path: ./automated-smoke-test/test-results

# Test job for the cases when we do not need deployment. It just rapidly
# installs (updates) app dependencies, and runs tests (ESLint, Stylelint,
# Jest unit-tests).
test:
docker:
- image: circleci/node:8.11.1
- image: circleci/node:10.24.1
steps:
- checkout
- restore_cache:
Expand Down Expand Up @@ -358,8 +358,6 @@ workflows:
branches:
only:
- develop
- TOP-1390
- PM-191-2
# This is alternate dev env for parallel testing
# Deprecate this workflow due to beta env shutdown
# https://topcoder.atlassian.net/browse/CORE-251
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v8.11.2
v10.24.1
6 changes: 5 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@
# and runs it against the specified Topcoder backend (development or
# production) when container is executed.

FROM node:8.11.2
FROM node:10.24.1
LABEL app="Community App" version="1.0"
RUN useradd -m -s /bin/bash appuser

WORKDIR /opt/app
COPY . .

RUN chown -R appuser:appuser /opt/app
USER appuser

################################################################################
# Receiving of build arguments.

Expand Down
87 changes: 0 additions & 87 deletions __tests__/shared/__snapshots__/index.jsx.snap

This file was deleted.

Loading

0 comments on commit 0601651

Please sign in to comment.