Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

hotfix/inc-15 #99

Merged
merged 26 commits into from
Dec 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
de3ae77
Merge branch 'develop'
Aug 5, 2021
5684c6b
Merge pull request #68 from topcoder-platform/develop
ThomasKranitsas Feb 3, 2022
73331de
redeploy
ThomasKranitsas Jun 9, 2022
d7356ed
Merge pull request #76 from yoution/feature/projectid
ThomasKranitsas Jul 5, 2022
2250362
Revert "Feature/projectid"
ThomasKranitsas Jul 5, 2022
853ce15
Merge pull request #78 from topcoder-platform/revert-76-feature/proje…
ThomasKranitsas Jul 5, 2022
e25c94a
Revert "Merge pull request #78 from topcoder-platform/revert-76-featu…
yoution Aug 1, 2022
9495652
Merge pull request #82 from yoution/master
jpeg22 Aug 2, 2022
7b85101
Merge pull request #84 from topcoder-platform/develop
ThomasKranitsas Sep 1, 2022
0250c13
try to fix sync script issue with payments
ThomasKranitsas Sep 6, 2022
1e63ab8
Merge pull request #87 from topcoder-platform/develop
ThomasKranitsas Sep 19, 2022
f6918ee
Merge pull request #89 from topcoder-platform/develop
ThomasKranitsas Sep 19, 2022
848d6b6
[Next Release] Enable V5 Elastic Search to be able to reach more than…
LieutenantRoger Oct 4, 2022
b9757e3
Prevent duplicate v5 challenge creation
ThomasKranitsas Nov 22, 2022
e386cfa
Merge pull request #94 from topcoder-platform/hotfix/duplicate-v5
ThomasKranitsas Nov 22, 2022
c99f544
change warning message on duplicate challenges
ThomasKranitsas Nov 22, 2022
5e76066
change log level
ThomasKranitsas Nov 22, 2022
7df1df1
fix: upgrade docker image
rakibansary Dec 7, 2022
4cc5142
fix: upgrade docker image
rakibansary Dec 7, 2022
e220aa9
Update config.yml
Gunasekar-K Dec 7, 2022
02c6bbf
secure /sync endpoint
ThomasKranitsas Dec 7, 2022
9ec0dbe
Update config.yml
Gunasekar-K Dec 7, 2022
27fe7b5
secure /sync endpoint
ThomasKranitsas Dec 7, 2022
447ecc7
Merge branch 'master' into hotfix/inc-15
rakibansary Dec 9, 2022
4d23cc2
Merge pull request #98 from topcoder-platform/hotfix/inc-15
rakibansary Dec 9, 2022
7860799
Merge branch 'develop' into master
rakibansary Dec 9, 2022
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
10 changes: 6 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
version: 2
defaults: &defaults
docker:
- image: circleci/python:2.7-stretch-browsers
- image: cimg/python:3.11.0-browsers
install_dependency: &install_dependency
name: Installation of build and deployment dependencies.
command: |
sudo apt install jq
sudo pip install awscli --upgrade
sudo pip install docker-compose
sudo apt update
sudo apt install python3-pip
sudo pip3 install awscli --upgrade
sudo pip3 install docker-compose
install_deploysuite: &install_deploysuite
name: Installation of install_deploysuite.
command: |
Expand Down Expand Up @@ -77,4 +79,4 @@ workflows:
context : org-global
filters:
branches:
only: master
only: master
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ Example:
`MIGRATION=001-migrate-taskData nf run npm run migrate`

## Production deployment

- TBD

## Running tests
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN sed -i '/jessie-updates/d' /etc/apt/sources.list
RUN apt-get -qq update && apt-get -qq install -y \
wget gcc g++ make xz-utils python2.7 git curl default-jdk

RUN wget -q -O node8.tar.xz https://nodejs.org/dist/v8.11.3/node-v8.11.3-linux-x64.tar.xz \
RUN wget -q -O node8.tar.xz https://nodejs.org/dist/v12.22.12/node-v12.22.12-linux-x64.tar.xz \
&& tar xfJ node8.tar.xz && rm -rf node8.tar.xz

ENV SERVERNAME=$servername
Expand All @@ -29,7 +29,7 @@ ENV CLIENT_LOCALE=en_US.utf8
ENV DB_LOCALE=en_US.utf8
ENV DBDATE Y4MD-
ENV DBDELIMITER "|"
ENV PATH /home/informix/node-v8.11.3-linux-x64/bin:${INFORMIXDIR}/bin:${INFORMIXDIR}/lib:${INFORMIXDIR}/lib/esql:${PATH}
ENV PATH /home/informix/node-v12.22.12-linux-x64/bin:${INFORMIXDIR}/bin:${INFORMIXDIR}/lib:${INFORMIXDIR}/lib/esql:${PATH}
ENV LD_LIBRARY_PATH ${INFORMIXDIR}/lib:${INFORMIXDIR}/lib/esql:${INFORMIXDIR}/lib/cli
ENV INFORMIXSQLHOSTS /opt/ibm/informix/etc/sqlhosts.informixoltp_tcp
ENV USER root
Expand Down
11 changes: 6 additions & 5 deletions docker/ECSDockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ RUN sed -i '/jessie-updates/d' /etc/apt/sources.list
RUN apt-get -qq update && apt-get -qq install -y \
wget gcc g++ make xz-utils python2.7 git curl default-jdk

RUN wget -q -O node8.tar.xz https://nodejs.org/dist/v8.11.3/node-v8.11.3-linux-x64.tar.xz \
&& tar xfJ node8.tar.xz && rm -rf node8.tar.xz
RUN wget -q -O node12.tar.xz https://nodejs.org/dist/v12.22.12/node-v12.22.12-linux-x64.tar.xz \
&& tar xfJ node12.tar.xz && rm -rf node12.tar.xz

RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive \
Expand All @@ -35,7 +35,7 @@ ENV CLIENT_LOCALE=en_US.utf8
ENV DB_LOCALE=en_US.utf8
ENV DBDATE Y4MD-
ENV DBDELIMITER "|"
ENV PATH /home/informix/node-v8.11.3-linux-x64/bin:${INFORMIXDIR}/bin:${INFORMIXDIR}/lib:${INFORMIXDIR}/lib/esql:${PATH}
ENV PATH /home/informix/node-v12.22.12-linux-x64/bin:${INFORMIXDIR}/bin:${INFORMIXDIR}/lib:${INFORMIXDIR}/lib/esql:${PATH}
ENV LD_LIBRARY_PATH ${INFORMIXDIR}/lib:${INFORMIXDIR}/lib/esql:${INFORMIXDIR}/lib/cli
ENV INFORMIXSQLHOSTS /opt/ibm/informix/etc/sqlhosts.informixoltp_tcp
ENV USER root
Expand All @@ -46,5 +46,6 @@ RUN echo "sqlexec 2021/tcp" >> /etc/services

COPY . /app
WORKDIR /app
RUN npm --unsafe-perm install
ENTRYPOINT ["npm", "start"]
RUN npm install --global yarn
RUN yarn
ENTRYPOINT ["yarn", "start"]
Loading